Browse Source

Cosmetics

Ask Solem 13 years ago
parent
commit
b3495bbb7e
5 changed files with 5 additions and 19 deletions
  1. 0 2
      celery/app/base.py
  2. 0 1
      celery/backends/mongodb.py
  3. 1 6
      celery/loaders/app.py
  4. 4 0
      celery/loaders/base.py
  5. 0 10
      celery/loaders/default.py

+ 0 - 2
celery/app/base.py

@@ -438,7 +438,6 @@ class Celery(object):
                 self.backend_cls, self.amqp_cls, self.events_cls,
                 self.log_cls, self.control_cls, self.accept_magic_kwargs)
 
-
     @cached_property
     def Worker(self):
         """Create new :class:`~celery.apps.worker.Worker` instance."""
@@ -466,7 +465,6 @@ class Celery(object):
     def annotations(self):
         return prepare_annotations(self.conf.CELERY_ANNOTATIONS)
 
-
     @cached_property
     def AsyncResult(self):
         return self.subclass_with_self("celery.result:AsyncResult")

+ 0 - 1
celery/backends/mongodb.py

@@ -165,7 +165,6 @@ class MongoBackend(BaseDictBackend):
 
     def cleanup(self):
         """Delete expired metadata."""
-        print("APP: %r" % (self.app.now(), ))
         self.collection.remove({
                 "date_done": {
                     "$lt": self.app.now() - self.expires,

+ 1 - 6
celery/loaders/app.py

@@ -15,9 +15,4 @@ from .base import BaseLoader
 
 
 class AppLoader(BaseLoader):
-
-    def on_worker_init(self):
-        self.import_default_modules()
-
-    def read_configuration(self):
-        return {}
+    pass

+ 4 - 0
celery/loaders/base.py

@@ -106,6 +106,7 @@ class BaseLoader(object):
     def init_worker(self):
         if not self.worker_initialized:
             self.worker_initialized = True
+            self.import_default_modules()
             self.on_worker_init()
 
     def init_worker_process(self):
@@ -202,6 +203,9 @@ class BaseLoader(object):
                     exc, {"To": to, "Subject": subject},
                     traceback.format_stack())))
 
+    def read_configuration(self):
+        return {}
+
     @property
     def conf(self):
         """Loader configuration."""

+ 0 - 10
celery/loaders/default.py

@@ -73,13 +73,3 @@ class Loader(BaseLoader):
 
     def wanted_module_item(self, item):
         return item[0].isupper() and not item.startswith("_")
-
-    def on_worker_init(self):
-        """Imports modules at worker init so tasks can be registered
-        and used by the worked.
-
-        The list of modules to import is taken from the
-        :setting:`CELERY_IMPORTS` setting.
-
-        """
-        self.import_default_modules()