Use USE_FAST_LOCALS envvar instead of USE_PURE_LOCALS, so optimizatio…

…n must be enabled manually
enlavin · Sep 12, 2012 · febda4c · febda4c
1 parent d753cd9
commit febda4c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/celery/concurrency/threads.py b/celery/concurrency/threads.py
@@ -14,10 +14,6 @@
 
 from .base import apply_target, BasePool
 
-#: Makes sure we don't use threading.local for stacks
-#: since apparently they don't work properly.
-os.environ['USE_PURE_LOCALS'] = '1'
-
 
 class NullDict(UserDict):
 

diff --git a/celery/utils/threads.py b/celery/utils/threads.py
@@ -13,12 +13,10 @@
 import threading
 import traceback
 
-from kombu.syn import _detect_environment
-
 from celery.local import Proxy
 from celery.utils.compat import THREAD_TIMEOUT_MAX
 
-USE_PURE_LOCALS = os.environ.get('USE_PURE_LOCALS')
+USE_FAST_LOCALS = os.environ.get('USE_FAST_LOCALS')
 
 _Thread = threading.Thread
 _Event = threading._Event
@@ -319,7 +317,7 @@ def top(self):
         except (AttributeError, IndexError):
             return None
 
-if _detect_environment() == 'default' and not USE_PURE_LOCALS:
+if USE_FAST_LOCALS:
     LocalStack = _FastLocalStack
 else:
     # - See #706

diff --git a/funtests/benchmarks/bench_worker.py b/funtests/benchmarks/bench_worker.py
@@ -2,7 +2,10 @@
 import sys
 import time
 
-os.environ['NOSETPS'] = 'yes'
+os.environ.update(
+    NOSETPS='yes',
+    USE_FAST_LOCALS='yes',
+)
 
 import anyjson
 JSONIMP = os.environ.get('JSONIMP')