Handle case if kwargs are passed in as None0.2.2.1

3 files changed, 8 insertions, 4 deletions

diff --git a/eventmq/__init__.py b/eventmq/__init__.py
index c7ed429..a63befc 100644
--- a/eventmq/__init__.py
+++ b/eventmq/__init__.py
@@ -1,5 +1,5 @@
 __author__ = 'EventMQ Contributors'
-__version__ = '0.2.2'
+__version__ = '0.2.2.1'
 
 PROTOCOL_VERSION = 'eMQP/1.0'
 
diff --git a/eventmq/jobmanager.py b/eventmq/jobmanager.py
index 332b178..52b3c7e 100644
--- a/eventmq/jobmanager.py
+++ b/eventmq/jobmanager.py
@@ -66,11 +66,15 @@ class JobManager(HeartbeatMixin, EMQPService):
         logger.info('Initializing JobManager {}...'.format(self.name))
 
         #: keep track of workers
-        concurrent_jobs = kwargs.pop('concurrent_jobs', conf.CONCURRENT_JOBS)
+        concurrent_jobs = kwargs.pop('concurrent_jobs', None)
+        if concurrent_jobs is None:
+            concurrent_jobs = conf.CONCURRENT_JOBS
         self.workers = Pool(processes=concurrent_jobs)
 
         #: List of queues that this job manager is listening on
-        self.queues = kwargs.pop('queues', conf.QUEUES)
+        self.queues = kwargs.pop('queues', None)
+        if self.queues is None:
+            self.quques = conf.QUEUES
 
         if not kwargs.pop('skip_signal', False):
             # handle any sighups by reloading config
diff --git a/setup.py b/setup.py
index 3762cd0..1dafa02 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='eventmq',
-    version='0.2.2',
+    version='0.2.2.1',
     description='EventMQ messaging system based on ZeroMQ',
     packages=find_packages(),
     install_requires=['pyzmq==14.6.0',