From 54e304200a869a33db12e18e34f6952f06fe991f Mon Sep 17 00:00:00 2001
From: jason
Date: Tue, 10 Apr 2018 16:32:38 -0600
Subject: Display EventMQ version on daemon startup

---
 etc/eventmq.conf-dist | 6 +++---
 eventmq/jobmanager.py | 2 ++
 eventmq/router.py     | 7 +++++--
 eventmq/scheduler.py  | 2 ++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/etc/eventmq.conf-dist b/etc/eventmq.conf-dist
index 1ff09c4..9a59f2a 100644
--- a/etc/eventmq.conf-dist
+++ b/etc/eventmq.conf-dist
@@ -27,13 +27,13 @@ queues=[[20,"heavy-cpu"], [30,"low-cpu"], [10,"default"]]
 concurrent_jobs=2
 
 # This function is executed when EventMQ creates a new worker subprocess
-# subprocess_setup_func = 'path.to.my_setup_function'
+# subprocess_setup_func = path.to.my_setup_function
 
 # This function is executed before every job
-# job_entry_func = 'path.to.my_job_setup_function'
+# job_entry_func = path.to.my_job_setup_function
 
 # This function is executed after every job
-# job_exit_func = 'path.to.my_job_teardown_function'
+# job_exit_func = path.to.my_job_teardown_function
 
 [publisher]
 publisher_incoming_addr=tcp://0.0.0.0:47298
diff --git a/eventmq/jobmanager.py b/eventmq/jobmanager.py
index 78a080b..f4a928c 100644
--- a/eventmq/jobmanager.py
+++ b/eventmq/jobmanager.py
@@ -29,6 +29,7 @@ import time
 import zmq
 
 from eventmq.log import setup_logger
+from . import __version__
 from . import conf
 from .constants import KBYE, STATUS
 from .poller import Poller, POLLIN
@@ -80,6 +81,7 @@ class JobManager(HeartbeatMixin, EMQPService):
         #: Define the name of this JobManager instance. Useful to know when
         #: referring to the logs.
         self.name = kwargs.pop('name', None) or generate_device_name()
+        logger.info('EventMQ Version {}'.format(__version__))
         logger.info('Initializing JobManager {}...'.format(self.name))
 
         #: keep track of workers
diff --git a/eventmq/router.py b/eventmq/router.py
index 0b896b3..81ca257 100644
--- a/eventmq/router.py
+++ b/eventmq/router.py
@@ -23,6 +23,7 @@ import logging
 import signal
 
 from eventmq.log import setup_logger, setup_wal_logger
+from . import __version__
 from . import conf, constants, exceptions, poller, receiver
 from .constants import (
     CLIENT_TYPE, DISCONNECT, KBYE, PROTOCOL_VERSION, ROUTER_SHOW_SCHEDULERS,
@@ -51,8 +52,11 @@ class Router(HeartbeatMixin):
     def __init__(self, *args, **kwargs):
         super(Router, self).__init__(*args, **kwargs)  # Creates _meta
 
+        setup_logger("eventmq")
+
         self.name = generate_device_name()
-        logger.info('Initializing Router %s...' % self.name)
+        logger.info('EventMQ Version {}'.format(__version__))
+        logger.info('Initializing Router {}...'.format(self.name))
 
         self.poller = poller.Poller()
 
@@ -943,7 +947,6 @@ class Router(HeartbeatMixin):
         """
         Kick off router with logging and settings import
         """
-        setup_logger('eventmq')
         import_settings()
         setup_wal_logger('eventmq-wal', conf.WAL)
         self.start(frontend_addr=conf.FRONTEND_ADDR,
diff --git a/eventmq/scheduler.py b/eventmq/scheduler.py
index 32c9b46..2ff726a 100644
--- a/eventmq/scheduler.py
+++ b/eventmq/scheduler.py
@@ -29,6 +29,7 @@ from six import next
 
 from eventmq.log import setup_logger
 
+from . import __version__
 from . import conf, constants
 from .client.messages import send_request
 from .constants import KBYE
@@ -53,6 +54,7 @@ class Scheduler(HeartbeatMixin, EMQPService):
     def __init__(self, *args, **kwargs):
         self.name = kwargs.get('name', None)
 
+        logger.info('EventMQ Version {}'.format(__version__))
         logger.info('Initializing Scheduler...')
         import_settings()
         super(Scheduler, self).__init__(*args, **kwargs)
-- 
cgit v1.2.1