浏览代码

Passthrough the complete delivery info. Fixes #807

Ask Solem 13 年之前
父节点
当前提交
502bd2cec9
共有 2 个文件被更改,包括 4 次插入8 次删除
  1. 3 1
      celery/tests/worker/test_request.py
  2. 1 7
      celery/worker/job.py

+ 3 - 1
celery/tests/worker/test_request.py

@@ -773,7 +773,9 @@ class test_TaskRequest(Case):
                     'task_id': tw.id,
                     'task_retries': 0,
                     'task_is_eager': False,
-                    'delivery_info': {'exchange': None, 'routing_key': None},
+                    'delivery_info': {'exchange': None,
+                                      'routing_key': None,
+                                      'priority': None},
                     'task_name': tw.name})
 
     @patch('celery.worker.job.logger')

+ 1 - 7
celery/worker/job.py

@@ -126,13 +126,7 @@ class Request(object):
         else:
             self.expires = None
 
-        delivery_info = {} if delivery_info is None else delivery_info
-        self.delivery_info = {
-            'exchange': delivery_info.get('exchange'),
-            'routing_key': delivery_info.get('routing_key'),
-            'priority': delivery_info.get('priority'),
-        }
-
+        self.delivery_info = delivery_info or {}
         self.request_dict = body
 
     @classmethod