process_queue: Fix worker variable being accessed before initialization.

timabbott · timabbott · commit 7595e4b05fe6 · 2016-02-03T19:29:44.000-08:00
diff --git a/zerver/management/commands/process_queue.py b/zerver/management/commands/process_queue.py
@@ -23,19 +23,19 @@ def handle(self, *args, **options):
         queue_name = options['queue_name']
         worker_num = options['worker_num']
 
-        def signal_handler(signal, frame):
-            logger.info("Worker %d disconnecting from queue %s" % (worker_num, queue_name))
-            worker.stop()
-            sys.exit(0)
-
         if not settings.USING_RABBITMQ:
             logger.error("Cannot run a queue processor when USING_RABBITMQ is False!")
             sys.exit(1)
 
+        logger.info("Worker %d connecting to queue %s" % (worker_num, queue_name))
+        worker = get_worker(queue_name)
+
+        def signal_handler(signal, frame):
+            logger.info("Worker %d disconnecting from queue %s" % (worker_num, queue_name))
+            worker.stop()
+            sys.exit(0)
         signal.signal(signal.SIGTERM, signal_handler)
         signal.signal(signal.SIGINT, signal_handler)
 
-        logger.info("Worker %d connecting to queue %s" % (worker_num, queue_name))
-        worker = get_worker(queue_name)
         worker.start()
 
