flakes

celery/worker/control.py

@@ -37,7 +37,6 @@ class Panel(UserDict):
 def revoke(panel, task_id, terminate=False, signal=None, **kwargs):
     """Revoke task by task id."""
     revoked.add(task_id)
-    action = 'revoked'
     if terminate:
         signum = _signals.signum(signal or 'TERM')
         for request in state.reserved_requests:
@@ -50,7 +49,7 @@ def revoke(panel, task_id, terminate=False, signal=None, **kwargs):
         return {'ok': 'terminating %s (%s)' % (task_id, signal)}
 
     logger.info('Revoking task %s', task_id)
-    return {'ok': 'task %s %s' % (task_id, action)}
+    return {'ok': 'revoking task %s' % (task_id, )}
 
 
 @Panel.register

celery/worker/job.py

@@ -363,7 +363,7 @@ class Request(object):
             # time to write the result.
             if self.store_errors:
                 if isinstance(exc, exceptions.WorkerLostError):
-                    self.task.backend.mark_as_failure(self.id, exc_info.exception)
+                    self.task.backend.mark_as_failure(self.id, exc)
                 elif isinstance(exc, exceptions.Terminated):
                     self._announce_revoked('terminated', True, str(exc), False)
             # (acks_late) acknowledge after result stored.