diff --git a/designate/cmd/__init__.py b/designate/cmd/__init__.py index 806716bce..3a7edfa9b 100644 --- a/designate/cmd/__init__.py +++ b/designate/cmd/__init__.py @@ -16,3 +16,9 @@ import eventlet eventlet.monkey_patch(os=False) +# 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 diff --git a/designate/cmd/manage.py b/designate/cmd/manage.py index 08cc472c7..bc8e8f907 100644 --- a/designate/cmd/manage.py +++ b/designate/cmd/manage.py @@ -29,6 +29,12 @@ from designate import utils from designate import version eventlet.monkey_patch(os=False) +# 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 CONF = designate.conf.CONF