openstack/mistral
Code Issues Proposed changes

Merge "Monkey patch original current_thread _active"

Browse Source
This commit is contained in:
Zuul 2020-05-13 19:37:00 +00:00 committed by Gerrit Code Review
commit acdb04c6f6
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mistral/cmd/launch.py
View File

@ -25,6 +25,12 @@ eventlet.monkey_patch(
socket=True, socket=True,
thread=False if '--use-debugger' in sys.argv else True, thread=False if '--use-debugger' in sys.argv else True,
time=True) time=True)
# Monkey patch the original current_thread to use the up-to-date _active
# global variable. See https://bugs.launchpad.net/bugs/1863021 and
# https://github.com/eventlet/eventlet/issues/592
import __original_module_threading as orig_threading
import threading # noqa
orig_threading.current_thread.__globals__['_active'] = threading._active
import os import os

2
tox.ini
View File

@ -39,7 +39,7 @@ commands = ./run_tests.sh -N --db-type mysql
[testenv:pep8] [testenv:pep8]
commands = commands =
doc8 doc/source doc8 doc/source
flake8 {posargs} . {toxinidir}/tools/get_action_list.py {toxinidir}/tools/sync_db.py flake8 {posargs} . {toxinidir}/tools/sync_db.py
[testenv:cover] [testenv:cover]
setenv = setenv =