aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Hurst2017-06-07 15:15:42 -0600
committerDavid Hurst2017-06-20 14:12:35 -0600
commitb7f5f9ea8a12344861f5e1f046ca3a212cca6593 (patch)
tree79986ed779087106ac9d15e71c2bf8249ebc7a0a
parentba2dd25fcdb43eca5f17155e0d22e1583f906525 (diff)
downloadeventmq-b7f5f9ea8a12344861f5e1f046ca3a212cca6593.tar.gz
eventmq-b7f5f9ea8a12344861f5e1f046ca3a212cca6593.zip
Add version printing to start of apps
-rw-r--r--eventmq/jobmanager.py4
-rw-r--r--eventmq/pub.py5
-rw-r--r--eventmq/router.py5
-rw-r--r--eventmq/scheduler.py6
-rw-r--r--eventmq/settings.py2
5 files changed, 15 insertions, 7 deletions
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
28 28
29import zmq 29import zmq
30 30
31from . import __version__
31from .constants import KBYE, STATUS 32from .constants import KBYE, STATUS
32from .poller import Poller, POLLIN 33from .poller import Poller, POLLIN
33from .sender import Sender 34from .sender import Sender
@@ -83,7 +84,8 @@ class JobManager(HeartbeatMixin, EMQPService):
83 #: referring to the logs. 84 #: referring to the logs.
84 self.name = generate_device_name(conf.NAME) 85 self.name = generate_device_name(conf.NAME)
85 86
86 logger.info('Initializing JobManager {}...'.format(self.name)) 87 logger.info('Initializing JobManager {}...'.format(str(self.name)))
88 logger.info('JogManager version: ' + __version__)
87 89
88 if not skip_signal: 90 if not skip_signal:
89 # handle any sighups by reloading config 91 # 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
19""" 19"""
20import logging 20import logging
21 21
22from . import exceptions, poller, publisher, receiver 22from . import __version__, exceptions, poller, publisher, receiver
23from .constants import STATUS 23from .constants import STATUS
24from .settings import conf, reload_settings 24from .settings import conf, reload_settings
25from .utils.classes import HeartbeatMixin 25from .utils.classes import HeartbeatMixin
@@ -45,6 +45,9 @@ class Pub(HeartbeatMixin):
45 self.override_settings = override_settings 45 self.override_settings = override_settings
46 reload_settings('publisher', self.override_settings) 46 reload_settings('publisher', self.override_settings)
47 47
48 logger.info('Initiaizing publisher...')
49 logger.info('Publisher version: ' + __version__)
50
48 super(Pub, self).__init__(*args, **kwargs) # creates _meta 51 super(Pub, self).__init__(*args, **kwargs) # creates _meta
49 self.poller = poller.Poller() 52 self.poller = poller.Poller()
50 self.incoming = receiver.Receiver() 53 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
22import logging 22import logging
23import signal 23import signal
24 24
25from . import constants, exceptions, poller, receiver 25from . import __version__, constants, exceptions, poller, receiver
26from .constants import ( 26from .constants import (
27 CLIENT_TYPE, DISCONNECT, KBYE, PROTOCOL_VERSION, STATUS, STATUS_CMD, 27 CLIENT_TYPE, DISCONNECT, KBYE, PROTOCOL_VERSION, STATUS, STATUS_CMD,
28 STATUS_COMMANDS 28 STATUS_COMMANDS
@@ -67,7 +67,8 @@ class Router(HeartbeatMixin):
67 67
68 self.name = generate_device_name(conf.NAME) 68 self.name = generate_device_name(conf.NAME)
69 69
70 logger.info('Initializing Router %s...' % self.name) 70 logger.info('Initializing Router %s...' % str(self.name))
71 logger.info('Router version: ' + __version__)
71 72
72 self.poller = poller.Poller() 73 self.poller = poller.Poller()
73 74
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
28import redis 28import redis
29from six import next 29from six import next
30 30
31from . import __version__
31from . import constants 32from . import constants
32from .client.messages import send_request 33from .client.messages import send_request
33from .constants import KBYE, STATUS_CMD, STATUS_COMMANDS 34from .constants import KBYE, STATUS_CMD, STATUS_COMMANDS
@@ -74,12 +75,13 @@ class Scheduler(HeartbeatMixin, EMQPService):
74 75
75 reload_settings('scheduler', self.override_settings) 76 reload_settings('scheduler', self.override_settings)
76 77
77 logger.info('Initializing Scheduler...')
78
79 super(Scheduler, self).__init__(*args, **kwargs) 78 super(Scheduler, self).__init__(*args, **kwargs)
80 79
81 self.name = generate_device_name(conf.NAME) 80 self.name = generate_device_name(conf.NAME)
82 81
82 logger.info('Initializing Scheduler... ' + str(self.name))
83 logger.info('Scheduler version: ' + __version__)
84
83 self.frontend = Sender(conf.NAME) 85 self.frontend = Sender(conf.NAME)
84 self._redis_server = None 86 self._redis_server = None
85 87
diff --git a/eventmq/settings.py b/eventmq/settings.py
index cd24984..34caf9f 100644
--- a/eventmq/settings.py
+++ b/eventmq/settings.py
@@ -50,7 +50,7 @@ import os
50# for py2 since dict().items() is inefficient 50# for py2 since dict().items() is inefficient
51from future.utils import iteritems 51from future.utils import iteritems
52 52
53from . import constants, __version__ 53from . import __version__, constants
54from .utils import tuplify 54from .utils import tuplify
55 55
56 56