Merge branch 'master' into warmshutdown

rq/worker.py

@@ -608,6 +608,7 @@ class Worker(object):
             except Exception:
                 job.set_status(JobStatus.FAILED, pipeline=pipeline)
                 started_job_registry.remove(job, pipeline=pipeline)
+                self.set_current_job_id(None, pipeline=pipeline)
                 try:
                     pipeline.execute()
                 except Exception:

tests/test_worker.py

@@ -157,6 +157,7 @@ class TestWorker(RQTestCase):
         # Postconditions
         self.assertEqual(q.count, 0)
         self.assertEqual(failed_q.count, 1)
+        self.assertEquals(w.get_current_job_id(), None)
 
         # Check the job
         job = Job.fetch(job.id)