diff options
| author | jason | 2016-07-06 18:48:36 -0600 |
|---|---|---|
| committer | jason | 2016-07-06 18:55:52 -0600 |
| commit | 66a43665426e35ee7e52c1134f615e2f67c93bb9 (patch) | |
| tree | e10f506a465b7ab66997a77616f0c7b7c626afb1 | |
| parent | 9ab6382f618a28fd0c86f703c7b99ba8b487d894 (diff) | |
| download | eventmq-0.2.3.4.tar.gz eventmq-0.2.3.4.zip | |
Don't fail on unschedule requests0.2.3.4
- fixes `client.messages.schedule(unschedule=True)` not running due to no cron or
seconds being passed into the function
- version bump
| -rw-r--r-- | eventmq/__init__.py | 2 | ||||
| -rw-r--r-- | eventmq/client/messages.py | 3 | ||||
| -rw-r--r-- | setup.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/eventmq/__init__.py b/eventmq/__init__.py index 1e7a310..e512d7a 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.3.3' | 2 | __version__ = '0.2.3.4' |
| 3 | 3 | ||
| 4 | PROTOCOL_VERSION = 'eMQP/1.0' | 4 | PROTOCOL_VERSION = 'eMQP/1.0' |
| 5 | 5 | ||
diff --git a/eventmq/client/messages.py b/eventmq/client/messages.py index a6de21a..951987e 100644 --- a/eventmq/client/messages.py +++ b/eventmq/client/messages.py | |||
| @@ -62,7 +62,8 @@ def schedule(socket, func, interval_secs=None, args=(), kwargs=None, | |||
| 62 | 'scheduling interval jobs') | 62 | 'scheduling interval jobs') |
| 63 | return | 63 | return |
| 64 | 64 | ||
| 65 | if (interval_secs and cron) or (not interval_secs and not cron): | 65 | if not unschedule and \ |
| 66 | ((interval_secs and cron) or (not interval_secs and not cron)): | ||
| 66 | logger.error('You must sepcify either `interval_secs` or `cron`, ' | 67 | logger.error('You must sepcify either `interval_secs` or `cron`, ' |
| 67 | 'but not both (or neither)') | 68 | 'but not both (or neither)') |
| 68 | return | 69 | return |
| @@ -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.3.3', | 10 | version='0.2.3.4', |
| 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', |