Browse Source

Skip blocking use

Ask Solem 13 years ago
parent
commit
da473f29f9
1 changed files with 3 additions and 4 deletions
  1. 3 4
      celery/worker/__init__.py

+ 3 - 4
celery/worker/__init__.py

@@ -18,7 +18,6 @@ import sys
 import threading
 import traceback
 
-from kombu.syn import blocking
 from kombu.utils.finalize import Finalize
 
 from .. import beat
@@ -266,7 +265,7 @@ class WorkController(object):
                 self.logger.debug("Starting thread %s...",
                                   component.__class__.__name__)
                 self._running = i + 1
-                blocking(component.start)
+                component.start()
         except SystemTerminate:
             self.terminate()
         except Exception, exc:
@@ -299,12 +298,12 @@ class WorkController(object):
     def stop(self, in_sighandler=False):
         """Graceful shutdown of the worker server."""
         if not in_sighandler or self.pool.signal_safe:
-            blocking(self._shutdown, warm=True)
+            self._shutdown(warm=True)
 
     def terminate(self, in_sighandler=False):
         """Not so graceful shutdown of the worker server."""
         if not in_sighandler or self.pool.signal_safe:
-            blocking(self._shutdown, warm=False)
+            self._shutdown(warm=False)
 
     def _shutdown(self, warm=True):
         what = (warm and "stopping" or "terminating").capitalize()