Merge pull request rq#576 from jlopex/ensure_custom_handlers_are_called

Ensure custom exception handlers call when Redis is down
kingwenChen · Aug 26, 2015 · cf20f1d · cf20f1d
2 parents 02c6df6 + 4fb59a4
commit cf20f1d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/rq/worker.py b/rq/worker.py
@@ -590,7 +590,12 @@ def perform_job(self, job):
             except Exception:
                 job.set_status(JobStatus.FAILED, pipeline=pipeline)
                 started_job_registry.remove(job, pipeline=pipeline)
-                pipeline.execute()
+                try:
+                    pipeline.execute()
+                except Exception:
+                    # Ensure that custom exception handlers are called
+                    # even if Redis is down
+                    pass
                 self.handle_exception(job, *sys.exc_info())
                 return False