Attempt to apply eventlet monkey patch workaround for issue eventlet/…

…eventlet#592.

st2common/st2common/util/monkey_patch.py

@@ -49,6 +49,11 @@ def monkey_patch(patch_thread=None):
 
     eventlet.monkey_patch(os=True, select=True, socket=True, thread=patch_thread, time=True)
 
+    # Monkey patch the original current_thread to use the up-to-date _active
+    # global variable. See https://github.com/eventlet/eventlet/issues/592
+    import __original_module_threading as orig_threading
+    import threading
+    orig_threading.current_thread.__globals__['_active'] = threading._active
 
 def use_select_poll_workaround(nose_only=True):
     """

st2stream/st2stream/cmd/api.py

@@ -41,6 +41,12 @@
     thread=False if '--use-debugger' in sys.argv else True,
     time=True)
 
+# Monkey patch the original current_thread to use the up-to-date _active
+# global variable. See https://github.com/eventlet/eventlet/issues/592
+import __original_module_threading as orig_threading
+import threading
+orig_threading.current_thread.__globals__['_active'] = threading._active
+
 LOG = logging.getLogger(__name__)
 
 # How much time to give to the request in progress to finish in seconds before killing them

st2tests/st2tests/base.py

@@ -20,6 +20,12 @@
 from st2common.util.monkey_patch import monkey_patch
 monkey_patch()
 
+# Monkey patch the original current_thread to use the up-to-date _active
+# global variable. See https://github.com/eventlet/eventlet/issues/592
+import __original_module_threading as orig_threading
+import threading
+orig_threading.current_thread.__globals__['_active'] = threading._active
+
 try:
     import simplejson as json
 except ImportError: