From 043ebb71c6354b62b56b0361b7fdbff54146241e Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Wed, 6 May 2020 08:10:32 +0200 Subject: [PATCH] Monkey patch original current_thread _active Monkey patch the original current_thread to use the up-to-date _active global variable. This solution is based on that documented at: https://github.com/eventlet/eventlet/issues/592 Change-Id: I194eedd505d45137963eb40d1b1d5da2309caeac Closes-Bug: #1863021 (cherry picked from commit 0b4c4f1de68631164d62dbf66160e5d8cb923518) --- watcher/cmd/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/watcher/cmd/__init__.py b/watcher/cmd/__init__.py index 567eb1305..f3a20d42d 100644 --- a/watcher/cmd/__init__.py +++ b/watcher/cmd/__init__.py @@ -18,3 +18,10 @@ import eventlet eventlet.monkey_patch() + +# 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