Merge pull request #75 from sideshowdave7/master0.3-rc8

ZMQError is thrown when we are polling and its rudely interrupted, ha…

3 files changed, 9 insertions, 3 deletions

diff --git a/eventmq/__init__.py b/eventmq/__init__.py
index 408adc3..4bcd4f9 100644
--- a/eventmq/__init__.py
+++ b/eventmq/__init__.py
@@ -1,5 +1,5 @@
 __author__ = 'EventMQ Contributors'
-__version__ = '0.3-rc7'
+__version__ = '0.3-rc8'
 
 PROTOCOL_VERSION = 'eMQP/1.0'
 
diff --git a/eventmq/jobmanager.py b/eventmq/jobmanager.py
index c5903d6..ed48e0d 100644
--- a/eventmq/jobmanager.py
+++ b/eventmq/jobmanager.py
@@ -20,6 +20,7 @@ Ensures things about jobs and spawns the actual tasks
 import sys
 import logging
 import signal
+import zmq
 
 from json import loads as deserializer
 
@@ -133,7 +134,12 @@ class JobManager(HeartbeatMixin, EMQPService):
                 self.request_queue.join_thread()
                 break
 
-            events = self.poller.poll()
+            try:
+                events = self.poller.poll()
+            except zmq.ZMQError:
+                logger.debug('Disconnecting due to ZMQ Error while polling')
+                self.received_disconnect = True
+                continue
 
             if events.get(self.outgoing) == POLLIN:
                 msg = self.outgoing.recv_multipart()
diff --git a/setup.py b/setup.py
index 5f91eac..31c35c7 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='eventmq',
-    version='0.3-rc7',
+    version='0.3-rc8',
     description='EventMQ messaging system based on ZeroMQ',
     packages=find_packages(),
     install_requires=['pyzmq==15.4.0',