Merge "Remove workaround for eventlet < 0.27.0"
This commit is contained in:
commit
a0d3899597
@ -1,6 +1,6 @@
|
|||||||
alembic>=1.8.0
|
alembic>=1.8.0
|
||||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||||
eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
|
eventlet>=0.27.0 # MIT
|
||||||
SQLAlchemy>=1.4.0 # MIT
|
SQLAlchemy>=1.4.0 # MIT
|
||||||
keystonemiddleware>=4.17.0 # Apache-2.0
|
keystonemiddleware>=4.17.0 # Apache-2.0
|
||||||
Routes>=2.3.1 # MIT
|
Routes>=2.3.1 # MIT
|
||||||
|
@ -26,9 +26,3 @@ import os
|
|||||||
if not os.environ.get('NO_EVENTLET_MONKEYPATCH'):
|
if not os.environ.get('NO_EVENTLET_MONKEYPATCH'):
|
||||||
import eventlet
|
import eventlet
|
||||||
eventlet.monkey_patch(all=True)
|
eventlet.monkey_patch(all=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 # noqa
|
|
||||||
import threading # noqa
|
|
||||||
orig_threading.current_thread.__globals__['_active'] = threading._active
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user