Set state to busy as early as possible.

13 years ago · 1177caf4bf
parent f2d5ebf2fe
commit 1177caf4bf
1 changed files with 4 additions and 3 deletions
--- a/rq/worker.py
+++ b/rq/worker.py
@ -256,7 +256,7 @@ class Worker(object):
                self.log.debug('Stopping after current horse is finished. '
                               'Press Ctrl+C again for a cold shutdown.')
            else:
-                raise StopRequested
+                raise StopRequested()

        signal.signal(signal.SIGINT, request_stop)
        signal.signal(signal.SIGTERM, request_stop)
@ -306,11 +306,12 @@ class Worker(object):
                    self.failed_queue.push_job_id(e.job_id)
                    continue

+                self.state = 'busy'
+
                job, queue = result
                self.log.info('%s: %s (%s)' % (green(queue.name),
                    blue(job.description), job.id))

-                self.state = 'busy'
                self.fork_and_perform_job(job)

                did_perform_work = True