ソースを参照

Forgot to remove import celeryconfig. Thanks to nikitka!

Ask Solem 15 年 前
コミット
2e048acac5
2 ファイル変更2 行追加2 行削除
  1. 2 1
      celery/bin/celeryd.py
  2. 0 1
      celery/loaders/default.py

+ 2 - 1
celery/bin/celeryd.py

@@ -182,9 +182,10 @@ def run_worker(concurrency=DAEMON_CONCURRENCY, detach=False,
         supervised=False, working_directory=None, chroot=None,
         supervised=False, working_directory=None, chroot=None,
         statistics=None, **kwargs):
         statistics=None, **kwargs):
     """Starts the celery worker server."""
     """Starts the celery worker server."""
+
     # set SIGCLD back to the default SIG_DFL (before python-daemon overrode it)
     # set SIGCLD back to the default SIG_DFL (before python-daemon overrode it)
     # lets the parent wait() for the terminated child process and stops
     # lets the parent wait() for the terminated child process and stops
-	# 'OSError: [Errno 10] No child processes' problem.
+    # 'OSError: [Errno 10] No child processes' problem.
     signal(SIGCLD, SIG_DFL)
     signal(SIGCLD, SIG_DFL)
     
     
     print("Celery %s is starting." % __version__)
     print("Celery %s is starting." % __version__)

+ 0 - 1
celery/loaders/default.py

@@ -30,7 +30,6 @@ class Loader(BaseLoader):
         configname = os.environ.get("CELERY_CONFIG_MODULE",
         configname = os.environ.get("CELERY_CONFIG_MODULE",
                                     DEFAULT_CONFIG_MODULE)
                                     DEFAULT_CONFIG_MODULE)
         celeryconfig = __import__(configname, {}, {}, [''])
         celeryconfig = __import__(configname, {}, {}, [''])
-        import celeryconfig
         usercfg = dict((key, getattr(celeryconfig, key))
         usercfg = dict((key, getattr(celeryconfig, key))
                             for key in dir(celeryconfig)
                             for key in dir(celeryconfig)
                                 if wanted_module_item(key))
                                 if wanted_module_item(key))