Merge pull request #836 from fate0/master

fix uncaught StopRequested during send heartbeat
8 years ago · a3e1ba9450
parent fbe4cafe2a 1ebf880402
commit a3e1ba9450
1 changed files with 7 additions and 7 deletions
--- a/rq/worker.py
+++ b/rq/worker.py
@ -466,15 +466,15 @@ class Worker(object):
                        if burst:
                            self.log.info("RQ worker {0!r} done, quitting".format(self.key))
                        break
+                        
+                    job, queue = result
+                    self.execute_job(job, queue)
+                    self.heartbeat()
+                    
+                    did_perform_work = True
+                    
                except StopRequested:
                    break
-
-                job, queue = result
-                self.execute_job(job, queue)
-                self.heartbeat()
-
-                did_perform_work = True
-
        finally:
            if not self.is_horse:
                self.register_death()