diff options
| -rw-r--r-- | eventmq/__init__.py | 2 | ||||
| -rw-r--r-- | eventmq/jobmanager.py | 8 | ||||
| -rw-r--r-- | setup.py | 2 |
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 @@ | |||
| 1 | __author__ = 'EventMQ Contributors' | 1 | __author__ = 'EventMQ Contributors' |
| 2 | __version__ = '0.2.2' | 2 | __version__ = '0.2.2.1' |
| 3 | 3 | ||
| 4 | PROTOCOL_VERSION = 'eMQP/1.0' | 4 | PROTOCOL_VERSION = 'eMQP/1.0' |
| 5 | 5 | ||
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): | |||
| 66 | logger.info('Initializing JobManager {}...'.format(self.name)) | 66 | logger.info('Initializing JobManager {}...'.format(self.name)) |
| 67 | 67 | ||
| 68 | #: keep track of workers | 68 | #: keep track of workers |
| 69 | concurrent_jobs = kwargs.pop('concurrent_jobs', conf.CONCURRENT_JOBS) | 69 | concurrent_jobs = kwargs.pop('concurrent_jobs', None) |
| 70 | if concurrent_jobs is None: | ||
| 71 | concurrent_jobs = conf.CONCURRENT_JOBS | ||
| 70 | self.workers = Pool(processes=concurrent_jobs) | 72 | self.workers = Pool(processes=concurrent_jobs) |
| 71 | 73 | ||
| 72 | #: List of queues that this job manager is listening on | 74 | #: List of queues that this job manager is listening on |
| 73 | self.queues = kwargs.pop('queues', conf.QUEUES) | 75 | self.queues = kwargs.pop('queues', None) |
| 76 | if self.queues is None: | ||
| 77 | self.quques = conf.QUEUES | ||
| 74 | 78 | ||
| 75 | if not kwargs.pop('skip_signal', False): | 79 | if not kwargs.pop('skip_signal', False): |
| 76 | # handle any sighups by reloading config | 80 | # handle any sighups by reloading config |
| @@ -7,7 +7,7 @@ from setuptools import setup, find_packages | |||
| 7 | 7 | ||
| 8 | setup( | 8 | setup( |
| 9 | name='eventmq', | 9 | name='eventmq', |
| 10 | version='0.2.2', | 10 | version='0.2.2.1', |
| 11 | description='EventMQ messaging system based on ZeroMQ', | 11 | description='EventMQ messaging system based on ZeroMQ', |
| 12 | packages=find_packages(), | 12 | packages=find_packages(), |
| 13 | install_requires=['pyzmq==14.6.0', | 13 | install_requires=['pyzmq==14.6.0', |