Browse Source

Merge commit '710b8d5'

Ask Solem 14 years ago
parent
commit
2494acb408
2 changed files with 9 additions and 0 deletions
  1. 3 0
      celery/task/control.py
  2. 6 0
      celery/worker/control/builtins.py

+ 3 - 0
celery/task/control.py

@@ -70,6 +70,9 @@ class Inspect(object):
     def cancel_consumer(self, queue, **kwargs):
         return self._request("cancel_consumer", queue=queue, **kwargs)
 
+    def worker_queues(self):
+        return self._request("worker_queues")
+
 
 class Control(object):
     Mailbox = Mailbox

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

@@ -203,3 +203,9 @@ def cancel_consumer(panel, queue=None, **_):
     cset = panel.consumer.task_consumer
     cset.cancel_by_queue(queue)
     return {"ok": "no longer consuming from %s" % (queue, )}
+    
+@Panel.register
+def worker_queues(panel):
+    """Returns the queues associated with each worker."""
+    return dict(panel.consumer.queues.iteritems())
+