aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsideshowdave72017-03-14 12:38:19 -0600
committersideshowdave72017-03-14 12:38:19 -0600
commit993b47eb0074a47beea2f3f3f0d96048674f4152 (patch)
treee2f5da6dc3842650ae52b5cbdbd28ca0af7c5f62
parentea01e0e6205cd314657c0ab5851a584685e0ecd9 (diff)
downloadeventmq-993b47eb0074a47beea2f3f3f0d96048674f4152.tar.gz
eventmq-993b47eb0074a47beea2f3f3f0d96048674f4152.zip
update log statement and version bump
-rw-r--r--eventmq/__init__.py2
-rw-r--r--eventmq/worker.py10
-rw-r--r--setup.py2
3 files changed, 10 insertions, 4 deletions
diff --git a/eventmq/__init__.py b/eventmq/__init__.py
index ab73a73..82801c5 100644
--- a/eventmq/__init__.py
+++ b/eventmq/__init__.py
@@ -1,5 +1,5 @@
1__author__ = 'EventMQ Contributors' 1__author__ = 'EventMQ Contributors'
2__version__ = '0.3.2' 2__version__ = '0.3.3'
3 3
4PROTOCOL_VERSION = 'eMQP/1.0' 4PROTOCOL_VERSION = 'eMQP/1.0'
5 5
diff --git a/eventmq/worker.py b/eventmq/worker.py
index 1e8e5a4..f456e45 100644
--- a/eventmq/worker.py
+++ b/eventmq/worker.py
@@ -69,7 +69,9 @@ class MultiprocessWorker(Process):
69 try: 69 try:
70 run_setup(conf.SETUP_PATH, conf.SETUP_CALLABLE) 70 run_setup(conf.SETUP_PATH, conf.SETUP_CALLABLE)
71 except Exception as e: 71 except Exception as e:
72 logger.warning('Unable to complete setup: ' + str(e)) 72 logger.warning('Unable to complete setup task ({}.{}): {}'
73 .format(conf.SETUP_PATH,
74 conf.SETUP_CALLABLE, str(e)))
73 75
74 import zmq 76 import zmq
75 zmq.Context.instance().term() 77 zmq.Context.instance().term()
@@ -167,7 +169,11 @@ def _run(payload):
167 169
168 170
169def run_setup(setup_path, setup_callable): 171def run_setup(setup_path, setup_callable):
170 logger.debug("Running setup for worker id {}".format(os.getpid())) 172 logger.debug("Running setup ({}.{}) for worker id {}".format(
173 setup_path,
174 setup_callable,
175 os.getpid()))
176
171 if ":" in setup_path: 177 if ":" in setup_path:
172 _pkgsplit = setup_path.split(':') 178 _pkgsplit = setup_path.split(':')
173 s_setup_package = _pkgsplit[0] 179 s_setup_package = _pkgsplit[0]
diff --git a/setup.py b/setup.py
index 7421ca5..38c9d0c 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from setuptools import find_packages, setup
7 7
8setup( 8setup(
9 name='eventmq', 9 name='eventmq',
10 version='0.3.2', 10 version='0.3.3',
11 description='EventMQ job execution and messaging system based on ZeroMQ', 11 description='EventMQ job execution and messaging system based on ZeroMQ',
12 packages=find_packages(), 12 packages=find_packages(),
13 install_requires=['pyzmq==15.4.0', 13 install_requires=['pyzmq==15.4.0',