3 files changed, 29 insertions, 11 deletions

diff --git a/eventmq/jobmanager.py b/eventmq/jobmanager.py
index c490e68..78a89e1 100644
--- a/eventmq/jobmanager.py
+++ b/eventmq/jobmanager.py
@@ -142,6 +142,9 @@ class JobManager(HeartbeatMixin, EMQPService):
         # Acknowledgment has come
         # Send a READY for each available worker
 
+        # Instatiate workers
+        self.workers
+
         self.status = STATUS.running
 
         try:
@@ -164,19 +167,24 @@ class JobManager(HeartbeatMixin, EMQPService):
                         else:
                             self.handle_response(resp)
 
-                    if self.status == STATUS.stopping and \
-                       not self.should_reset:
+                    if self.status == STATUS.stopping:
                         if len(self._workers) > 0:
                             time.sleep(0.1)
-                        else:
+                        elif not self.should_reset:
                             sys.exit(0)
+                        else:
+                            break
 
                         if monotonic() > self.disconnect_time + \
                            conf.KILL_GRACE_PERIOD:
                             logger.debug("Killing unresponsive workers")
                             for pid in self._workers.keys():
                                 self.kill_worker(pid, signal.SIGKILL)
-                            sys.exit(0)
+
+                            if not self.should_reset:
+                                sys.exit(0)
+                            else:
+                                break
                     else:
                         try:
                             events = self.poller.poll(1000)
@@ -200,6 +208,14 @@ class JobManager(HeartbeatMixin, EMQPService):
         except Exception:
             logger.exception("Unhandled exception in main jobmanager loop")
 
+        # Cleanup
+        del self._workers
+
+        # Flush the queues with workers
+        self.request_queue = mp_queue()
+        self.finished_queue = mp_queue()
+        logger.info("Reached end of event loop")
+
     def handle_response(self, resp):
         """
         Handles a response from a worker process to the jobmanager
@@ -321,7 +337,8 @@ class JobManager(HeartbeatMixin, EMQPService):
             del self._workers[pid]
 
     def worker_ready(self, reply, msgid, death, pid):
-        self.send_ready()
+        if self.status != STATUS.stopping:
+            self.send_ready()
 
     def worker_done_with_reply(self, reply, msgid, death, pid):
         """
@@ -350,6 +367,7 @@ class JobManager(HeartbeatMixin, EMQPService):
         for another REQUEST message.
         """
         self.total_ready_sent += 1
+        logger.debug("Sending READY")
         sendmsg(self.frontend, 'READY')
 
     def send_reply(self, reply, msgid):
@@ -416,7 +434,7 @@ class JobManager(HeartbeatMixin, EMQPService):
             self.reset()
 
     def sighup_handler(self, signum, frame):
-        logger.info('Caught signal %s' % signum)
+        logger.info('Caught SIGHUP')
         reload_settings('jobmanager', self.override_settings)
 
         self.should_reset = True
diff --git a/eventmq/utils/classes.py b/eventmq/utils/classes.py
index 4dc3f0d..39ec852 100644
--- a/eventmq/utils/classes.py
+++ b/eventmq/utils/classes.py
@@ -182,6 +182,7 @@ class EMQPService(object):
         Resets the current connection by closing and reopening the socket
         """
         # Unregister the old socket from the poller
+        logger.debug("Resetting Jobmanager")
         self.poller.unregister(self.frontend)
 
         # Polish up a new socket to use
@@ -190,6 +191,9 @@ class EMQPService(object):
         # Prepare the device to connect again
         self._setup()
 
+        # Start the jobmanager again
+        self.start()
+
     def process_message(self, msg):
         """
         Processes a message. Processing takes form of calling an
diff --git a/eventmq/worker.py b/eventmq/worker.py
index 14d4dfe..76fb16f 100644
--- a/eventmq/worker.py
+++ b/eventmq/worker.py
@@ -109,16 +109,12 @@ class MultiprocessWorker(Process):
                 timeout = payload.get("timeout") or conf.GLOBAL_TIMEOUT
                 msgid = payload.get('msgid', '')
                 callback = payload.get('callback', '')
-                logger.debug("Putting on thread queue msgid: {}".format(
-                    msgid))
 
                 worker_queue.put(payload['params'])
 
                 try:
                     return_val = worker_result_queue.get(timeout=timeout)
 
-                    logger.debug("Got from result queue msgid: {}".format(
-                        msgid))
                 except Queue.Empty:
                     return_val = 'TimeoutError'
 
@@ -129,7 +125,7 @@ class MultiprocessWorker(Process):
                         {'msgid': msgid,
                          'return': return_val,
                          'death': self.job_count >= conf.MAX_JOB_COUNT or
-                         return_val == 'TimeoutError',
+                         return_val["value"] == 'TimeoutError',
                          'pid': os.getpid(),
                          'callback': callback}
                     )