Ask Solem 13 سال پیش
والد
کامیت
e6c19ad57f
6فایلهای تغییر یافته به همراه6 افزوده شده و 8 حذف شده
  1. 2 3
      celery/app/amqp.py
  2. 1 1
      celery/backends/base.py
  3. 1 1
      celery/concurrency/processes/_win.py
  4. 1 1
      celery/events/cursesmon.py
  5. 1 1
      celery/schedules.py
  6. 0 1
      celery/worker/consumer.py

+ 2 - 3
celery/app/amqp.py

@@ -145,6 +145,7 @@ class TaskProducer(Producer):
         if not isinstance(exchange, Exchange):
             exchange = Exchange(exchange,
                     kwargs.get("exchange_type") or self.exchange_type)
+        self.queues = self.app.amqp.queues  # shortcut
         super(TaskProducer, self).__init__(channel, exchange, *args, **kwargs)
 
     def delay_task(self, task_name, task_args=None, task_kwargs=None,
@@ -190,14 +191,12 @@ class TaskProducer(Producer):
         if chord:
             body["chord"] = chord
 
-        print("KWARGS: %r" % (kwargs, ))
-
         self.publish(body, exchange=exchange, mandatory=mandatory,
              immediate=immediate, routing_key=routing_key,
              serializer=serializer or self.serializer,
              compression=compression or self.compression,
              retry=retry, retry_policy=_rp, delivery_mode=delivery_mode,
-             declare=[self.app.amqp.queues[queue]] if queue else [],
+             declare=[self.queues[queue]] if queue else [],
              **kwargs)
 
         signals.task_sent.send(sender=task_name, **body)

+ 1 - 1
celery/backends/base.py

@@ -144,7 +144,7 @@ class BaseBackend(object):
 
         time_elapsed = 0.0
 
-        while True:
+        while 1:
             status = self.get_status(task_id)
             if status == states.SUCCESS:
                 return self.get_result(task_id)

+ 1 - 1
celery/concurrency/processes/_win.py

@@ -79,7 +79,7 @@ def get_processtree_pids(pid, include_parent=True):
     parents = get_all_processes_pids()
     all_pids = parents.keys()
     pids = set([pid])
-    while True:
+    while 1:
         pids_new = pids.copy()
 
         for _pid in all_pids:

+ 1 - 1
celery/events/cursesmon.py

@@ -223,7 +223,7 @@ class CursesMonitor(object):  # pragma: no cover
         curses.echo()
         try:
             i = 0
-            while True:
+            while 1:
                 ch = self.win.getch(x, y + i)
                 if ch != -1:
                     if ch in (10, curses.KEY_ENTER):            # enter

+ 1 - 1
celery/schedules.py

@@ -339,7 +339,7 @@ class crontab(schedule):
             return False
 
         def roll_over():
-            while True:
+            while 1:
                 flag = (datedata.dom == len(days_of_month) or
                             day_out_of_range(datedata.year,
                                              months_of_year[datedata.moy],

+ 0 - 1
celery/worker/consumer.py

@@ -424,7 +424,6 @@ class Consumer(object):
                 else:
                     sleep(min(time_to_sleep, 1))
 
-
     def on_task(self, task):
         """Handle received task.