Browse Source

Merge "Monkey patch original current_thread _active" into stable/ussuri

stable/ussuri
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
bcfb92d927
4 changed files with 24 additions and 0 deletions
  1. +6
    -0
      heat/cmd/all.py
  2. +6
    -0
      heat/cmd/api.py
  3. +6
    -0
      heat/cmd/api_cfn.py
  4. +6
    -0
      heat/cmd/engine.py

+ 6
- 0
heat/cmd/all.py View File

@@ -20,6 +20,12 @@ An OpenStack Heat server that can run all services.

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
import threading # noqa
orig_threading.current_thread.__globals__['_active'] = threading._active

import sys



+ 6
- 0
heat/cmd/api.py View File

@@ -20,6 +20,12 @@ An OpenStack ReST API to Heat.

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
import threading # noqa
orig_threading.current_thread.__globals__['_active'] = threading._active

import sys



+ 6
- 0
heat/cmd/api_cfn.py View File

@@ -22,6 +22,12 @@ AMQP RPC to implement them.

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
import threading # noqa
orig_threading.current_thread.__globals__['_active'] = threading._active

import sys



+ 6
- 0
heat/cmd/engine.py View File

@@ -22,6 +22,12 @@ engine.

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
import threading # noqa
orig_threading.current_thread.__globals__['_active'] = threading._active

import sys



Loading…
Cancel
Save