Ask Solem 15 years ago
parent
commit
98406f8e35
3 changed files with 2 additions and 9 deletions
  1. 2 1
      celery/messaging.py
  2. 0 7
      celery/worker/__init__.py
  3. 0 1
      celery/worker/control/builtins.py

+ 2 - 1
celery/messaging.py

@@ -160,12 +160,13 @@ class ControlReplyConsumer(Consumer):
             responses.append(message_data)
 
         self.callbacks = [callback]
-        it = self.iterconsume()
+        self.consume()
         for i in limit and range(limit) or count():
             try:
                 self.connection.drain_events(timeout=timeout)
             except socket.timeout:
                 break
+
         return responses
 
 

+ 0 - 7
celery/worker/__init__.py

@@ -6,7 +6,6 @@ The Multiprocessing Worker Server
 import socket
 import logging
 import traceback
-from Queue import Queue
 from multiprocessing.util import Finalize
 
 from celery import conf
@@ -84,12 +83,6 @@ class WorkController(object):
         The :class:`Queue.Queue` that holds tasks ready for immediate
         processing.
 
-    .. attribute:: hold_queue
-
-        The :class:`Queue.Queue` that holds paused tasks. Reasons for holding
-        back the task include waiting for ``eta`` to pass or the task is being
-        retried.
-
     .. attribute:: schedule_controller
 
         Instance of :class:`celery.worker.controllers.ScheduleController`.

+ 0 - 1
celery/worker/control/builtins.py

@@ -3,7 +3,6 @@ from datetime import datetime
 from celery import conf
 from celery.registry import tasks
 from celery.worker.revoke import revoked
-from celery.worker.buckets import TaskBucket
 from celery.worker.control.registry import Panel
 
 TASK_INFO_FIELDS = ("exchange", "routing_key", "rate_limit")