celery.bin.celeryd + .celerybeat: Now use self.app.Worker / self.app.Beat

celery/bin/base.py

@@ -75,15 +75,15 @@ class Command(object):
         config_module = preload_options.pop("config_module", None)
         if config_module:
             os.environ["CELERY_CONFIG_MODULE"] = config_module
-        self.app = (app and get_symbol_by_name(app) or
+        self.app = (app and self.get_cls_by_name(app) or
                             self.get_app(loader=loader))
         if self.enable_config_from_cmdline:
             argv = self.process_cmdline_config(argv)
         return argv
 
-    def get_symbol_by_name(self, name):
-        from celery.utils import get_symbol_by_name
-        return get_symbol_by_name(name)
+    def get_cls_by_name(self, name):
+        from celery.utils import get_cls_by_name
+        return get_cls_by_name(name)
 
     def process_cmdline_config(self, argv):
         try:

celery/bin/celerybeat.py

@@ -28,9 +28,8 @@ from celery.bin.base import Command, Option
 class BeatCommand(Command):
 
     def run(self, *args, **kwargs):
-        from celery.apps.beat import Beat
-        kwargs["app"] = self.app
-        return Beat(*args, **kwargs).run()
+        kwargs.pop("app", None)
+        return self.app.Beat(*args, **kwargs).run()
 
     def get_options(self):
         conf = self.app.conf

celery/bin/celeryd.py

@@ -78,9 +78,8 @@ class WorkerCommand(Command):
     enable_config_from_cmdline = True
 
     def run(self, *args, **kwargs):
-        from celery.apps.worker import Worker
-        kwargs["app"] = self.app
-        return Worker(**kwargs).run()
+        kwargs.pop("app", None)
+        return self.app.Worker(**kwargs).run()
 
     def get_options(self):
         conf = self.app.conf