Browse Source

Enable task_reject_on_worker_lost for Redis. Closes #3541

Ask Solem 8 years ago
parent
commit
ec1fd31e9b
2 changed files with 2 additions and 2 deletions
  1. 1 1
      celery/worker/request.py
  2. 1 1
      t/unit/worker/test_request.py

+ 1 - 1
celery/worker/request.py

@@ -367,7 +367,7 @@ class Request(object):
             )
         # (acks_late) acknowledge after result stored.
         if self.task.acks_late:
-            requeue = self.delivery_info.get('redelivered', None) is False
+            requeue = not self.delivery_info.get('redelivered')
             reject = (
                 self.task.reject_on_worker_lost and
                 isinstance(exc, WorkerLostError)

+ 1 - 1
t/unit/worker/test_request.py

@@ -337,7 +337,7 @@ class test_Request(RequestCase):
         req.delivery_info['redelivered'] = None
         req.on_failure(einfo)
         req.on_reject.assert_called_with(
-            req_logger, req.connection_errors, False)
+            req_logger, req.connection_errors, True)
 
     def test_tzlocal_is_cached(self):
         req = self.get_request(self.add.s(2, 2))