Merge pull request #49 from sideshowdave7/0.40.4

Version info

7 files changed, 22 insertions, 10 deletions

diff --git a/eventmq/__init__.py b/eventmq/__init__.py
index 492f1b9..35a9c18 100644
--- a/eventmq/__init__.py
+++ b/eventmq/__init__.py
@@ -1,5 +1,5 @@
 __author__ = 'EventMQ Contributors'
-__version__ = '0.3.4.4'
+__version__ = '0.4rc1'
 
 PROTOCOL_VERSION = 'eMQP/1.0'
 
diff --git a/eventmq/jobmanager.py b/eventmq/jobmanager.py
index dbf930c..1126ae4 100644
--- a/eventmq/jobmanager.py
+++ b/eventmq/jobmanager.py
@@ -28,6 +28,7 @@ import time
 
 import zmq
 
+from . import __version__
 from .constants import KBYE, STATUS
 from .poller import Poller, POLLIN
 from .sender import Sender
@@ -83,7 +84,8 @@ class JobManager(HeartbeatMixin, EMQPService):
         #: referring to the logs.
         self.name = generate_device_name(conf.NAME)
 
-        logger.info('Initializing JobManager {}...'.format(self.name))
+        logger.info('Initializing JobManager {}...'.format(str(self.name)))
+        logger.info('JogManager version: ' + __version__)
 
         if not skip_signal:
             # handle any sighups by reloading config
diff --git a/eventmq/pub.py b/eventmq/pub.py
index 3655a2b..d063841 100644
--- a/eventmq/pub.py
+++ b/eventmq/pub.py
@@ -19,7 +19,7 @@ Publishes messages to subscribers
 """
 import logging
 
-from . import exceptions, poller, publisher, receiver
+from . import __version__, exceptions, poller, publisher, receiver
 from .constants import STATUS
 from .settings import conf, reload_settings
 from .utils.classes import HeartbeatMixin
@@ -45,6 +45,9 @@ class Pub(HeartbeatMixin):
         self.override_settings = override_settings
         reload_settings('publisher', self.override_settings)
 
+        logger.info('Initiaizing publisher...')
+        logger.info('Publisher version: ' + __version__)
+
         super(Pub, self).__init__(*args, **kwargs)  # creates _meta
         self.poller = poller.Poller()
         self.incoming = receiver.Receiver()
diff --git a/eventmq/router.py b/eventmq/router.py
index 89f92e8..04efb33 100644
--- a/eventmq/router.py
+++ b/eventmq/router.py
@@ -22,7 +22,7 @@ import json  # deserialize queues in on_inform. should be refactored
 import logging
 import signal
 
-from . import constants, exceptions, poller, receiver
+from . import __version__, constants, exceptions, poller, receiver
 from .constants import (
     CLIENT_TYPE, DISCONNECT, KBYE, PROTOCOL_VERSION, STATUS, STATUS_CMD,
     STATUS_COMMANDS
@@ -67,7 +67,8 @@ class Router(HeartbeatMixin):
 
         self.name = generate_device_name(conf.NAME)
 
-        logger.info('Initializing Router %s...' % self.name)
+        logger.info('Initializing Router %s...' % str(self.name))
+        logger.info('Router version: ' + __version__)
 
         self.poller = poller.Poller()
 
diff --git a/eventmq/scheduler.py b/eventmq/scheduler.py
index 4f1d5ad..58c138e 100644
--- a/eventmq/scheduler.py
+++ b/eventmq/scheduler.py
@@ -28,6 +28,7 @@ from future.utils import iteritems
 import redis
 from six import next
 
+from . import __version__
 from . import constants
 from .client.messages import send_request
 from .constants import KBYE, STATUS_CMD, STATUS_COMMANDS
@@ -74,12 +75,13 @@ class Scheduler(HeartbeatMixin, EMQPService):
 
         reload_settings('scheduler', self.override_settings)
 
-        logger.info('Initializing Scheduler...')
-
         super(Scheduler, self).__init__(*args, **kwargs)
 
         self.name = generate_device_name(conf.NAME)
 
+        logger.info('Initializing Scheduler... ' + str(self.name))
+        logger.info('Scheduler version: ' + __version__)
+
         self.frontend = Sender(conf.NAME)
         self._redis_server = None
 
diff --git a/eventmq/settings.py b/eventmq/settings.py
index 826b3a1..34caf9f 100644
--- a/eventmq/settings.py
+++ b/eventmq/settings.py
@@ -50,7 +50,7 @@ import os
 # for py2 since dict().items() is inefficient
 from future.utils import iteritems
 
-from . import constants
+from . import __version__, constants
 from .utils import tuplify
 
 
@@ -478,7 +478,7 @@ def build_parser_arguments(parser, section):
         section (str): the section of the config to generate arguments for.
     """
     for s in ('global', section):
-        for k, v in iteritems(_CONFIG_DEFS[s]):
+        for _, v in iteritems(_CONFIG_DEFS[s]):
             if not v.get('long-arg'):
                 continue
 
@@ -502,6 +502,10 @@ def build_parser_arguments(parser, section):
 
             parser.add_argument(*add_argument_args, **add_argument_kwargs)
 
+    # Tack on the version arugment to all options
+    parser.add_argument('--version', action='version',
+                        version='%(prog)s ' + __version__)
+
 
 class Conf(object):
     """
diff --git a/setup.py b/setup.py
index 3f4eb70..c77b0b7 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='eventmq',
-    version='0.3.4.4',
+    version='0.4rc1',
     description='EventMQ job execution and messaging system based on ZeroMQ',
     packages=find_packages(),
     install_requires=['pyzmq==16.0.2',