Disable agent for now

celery/app/defaults.py

@@ -150,7 +150,7 @@ NAMESPACES = {
         'WORKER_DIRECT': Option(False, type='bool'),
     },
     'CELERYD': {
-        'AGENT': Option('cell.agents:dAgent'),
+        'AGENT': Option(None, type='string'),
         'AUTOSCALER': Option('celery.worker.autoscale:Autoscaler'),
         'AUTORELOADER': Option('celery.worker.autoreload:Autoreloader'),
         'BOOT_STEPS': Option((), type='tuple'),

celery/worker/actors.py

@@ -1,26 +0,0 @@
-from __future__ import absolute_import
-
-from celery.bootsteps import StartStopStep
-from celery.utils.imports import instantiate, qualname
-from celery.utils.log import get_logger
-from celery.worker.consumer import Connection
-from cell import Actor
-from kombu.common import ignore_errors
-from kombu.utils import uuid
-
-logger = get_logger(__name__)
-debug, warn, error = logger.debug, logger.warn, logger.error
-
-
-class Bootstep(StartStopStep):
-    requires = (Connection, )
-
-    def __init__(self, c, **kwargs):
-        c.agent = None
-
-    def create(self, c):
-        agent = c.app.conf.CELERYD_AGENT
-        agent = c.agent = self.instantiate(c.app.conf.CELERYD_AGENT,
-            connection=c.connection, app=c.app,
-        )
-        return agent

celery/worker/consumer.py

@@ -457,6 +457,18 @@ class Tasks(bootsteps.StartStopStep):
             c.task_consumer = None
 
 
+class Agent(bootsteps.StartStopStep):
+    requires = (Connection, )
+
+    def __init__(self, c, **kwargs):
+        self.agent_cls = self.enabled = c.app.conf.CELERYD_AGENT
+
+
+    def create(self, c):
+        agent = c.agent = self.instantiate(self.agent_cls, c.connection)
+        return agent
+
+
 class Evloop(bootsteps.StartStopStep):
     last = True