generate_device_name now does the work it should

11 files changed, 28 insertions, 37 deletions

diff --git a/eventmq/jobmanager.py b/eventmq/jobmanager.py
index 41f30d3..dbf930c 100644
--- a/eventmq/jobmanager.py
+++ b/eventmq/jobmanager.py
@@ -81,10 +81,7 @@ class JobManager(HeartbeatMixin, EMQPService):
 
         #: Define the name of this JobManager instance. Useful to know when
         #: referring to the logs.
-        if conf.NAME:
-            self.name = "{}:{}".format(conf.NAME, generate_device_name())
-        else:
-            self.name = generate_device_name()
+        self.name = generate_device_name(conf.NAME)
 
         logger.info('Initializing JobManager {}...'.format(self.name))
 
@@ -100,7 +97,7 @@ class JobManager(HeartbeatMixin, EMQPService):
         #: then telling the router that it is READY. The reply will be the unit
         #: of work.
         # Despite the name, jobs are received on this socket
-        self.frontend = Sender(name=self.name)
+        self.frontend = Sender(name=conf.NAME)
 
         self.poller = Poller()
 
diff --git a/eventmq/publisher.py b/eventmq/publisher.py
index aac7b79..7b5c1fb 100644
--- a/eventmq/publisher.py
+++ b/eventmq/publisher.py
@@ -23,14 +23,13 @@ import zmq
 
 from . import constants
 from .utils.devices import generate_device_name
-from .settings import conf
 
 logger = logging.getLogger(__name__)
 
 
 class Publisher(object):
     """
-        name (str): Name of this socket
+        name (str): Named prefix of this socket
         zcontext (:class:`zmq.Context`): socket context
         zsocket (:class:`zmq.Socket`):
     """
@@ -38,13 +37,10 @@ class Publisher(object):
     def __init__(self, *args, **kwargs):
         self.zcontext = kwargs.get('context', zmq.Context.instance())
 
-        if conf.NAME:
-            self.name = "{}:{}".format(conf.NAME, generate_device_name())
-        else:
-            self.name = generate_device_name()
+        self.name = generate_device_name(kwargs.pop('name', None))
 
         self.zsocket = kwargs.get('socket', self.zcontext.socket(zmq.PUB))
-        self.zsocket.setsockopt_string(zmq.IDENTITY, self.name)
+        self.zsocket.setsockopt(zmq.IDENTITY, self.name)
 
         self.status = constants.STATUS.ready
 
diff --git a/eventmq/receiver.py b/eventmq/receiver.py
index 6c9060f..4450e2e 100644
--- a/eventmq/receiver.py
+++ b/eventmq/receiver.py
@@ -57,7 +57,7 @@ class Receiver(ZMQReceiveMixin, ZMQSendMixin):
         self.name = kwargs.get('name', generate_device_name())
 
         self.zsocket = kwargs.get('socket', self.zcontext.socket(zmq.ROUTER))
-        self.zsocket.setsockopt_string(zmq.IDENTITY, self.name)
+        self.zsocket.setsockopt(zmq.IDENTITY, self.name)
         self.zsocket.setsockopt(zmq.ROUTER_MANDATORY, 1)
 
         self.status = constants.STATUS.ready
diff --git a/eventmq/router.py b/eventmq/router.py
index 3911997..eceb080 100644
--- a/eventmq/router.py
+++ b/eventmq/router.py
@@ -64,10 +64,7 @@ class Router(HeartbeatMixin):
 
         super(Router, self).__init__(*args, **kwargs)  # Creates _meta
 
-        if conf.NAME:
-            self.name = "{}:{}".format(conf.NAME, generate_device_name())
-        else:
-            self.name = generate_device_name()
+        self.name = generate_device_name(conf.NAME)
 
         logger.info('Initializing Router %s...' % self.name)
 
diff --git a/eventmq/scheduler.py b/eventmq/scheduler.py
index 686b29c..799ae20 100644
--- a/eventmq/scheduler.py
+++ b/eventmq/scheduler.py
@@ -75,12 +75,9 @@ class Scheduler(HeartbeatMixin, EMQPService):
 
         super(Scheduler, self).__init__(*args, **kwargs)
 
-        if conf.NAME:
-            self.name = "{}:{}".format(conf.NAME, generate_device_name())
-        else:
-            self.name = generate_device_name()
+        self.name = generate_device_name(conf.NAME)
 
-        self.frontend = Sender()
+        self.frontend = Sender(conf.NAME)
         self._redis_server = None
 
         # contains dict of 4-item lists representing cron jobs key of this
diff --git a/eventmq/sender.py b/eventmq/sender.py
index 315e04e..4396e7f 100644
--- a/eventmq/sender.py
+++ b/eventmq/sender.py
@@ -18,13 +18,12 @@
 The sender is responsible for sending messages
 """
 import logging
-import sys
-import uuid
 
 import zmq
 
 from . import constants, exceptions
 from .utils.classes import ZMQReceiveMixin, ZMQSendMixin
+from .utils.devices import generate_device_name
 
 logger = logging.getLogger(__name__)
 
@@ -61,7 +60,8 @@ class Sender(ZMQSendMixin, ZMQReceiveMixin):
         # rebuilding it later.
         self.zsocket = None
 
-        self.name = kwargs.pop('name', str(uuid.uuid4()))
+        # Immutable name that was specified at construction time
+        self.conf_name = kwargs.pop('name', None)
 
         self.rebuild(*args, **kwargs)
 
@@ -138,7 +138,8 @@ class Sender(ZMQSendMixin, ZMQReceiveMixin):
             self.zsocket.close()
 
         self.zsocket = kwargs.pop('socket', self.zcontext.socket(zmq.DEALER))
-        self.zsocket.setsockopt_string(zmq.IDENTITY, str(self.name))
+        self.name = generate_device_name(self.conf_name)
+        self.zsocket.setsockopt(zmq.IDENTITY, self.name)
 
         self.status = constants.STATUS.ready
 
diff --git a/eventmq/tests/test_jobmanager.py b/eventmq/tests/test_jobmanager.py
index 2f9218f..a19dfd7 100644
--- a/eventmq/tests/test_jobmanager.py
+++ b/eventmq/tests/test_jobmanager.py
@@ -30,7 +30,7 @@ class TestCase(unittest.TestCase):
             'NAME': 'RuckusBringer'
         }
         jm = jobmanager.JobManager(override_settings=override_settings)
-        self.assertEqual(jm.name, 'RuckusBringer:some_uuid')
+        self.assertEqual(jm.name.decode('ascii'), 'RuckusBringer:some_uuid')
 
         self.assertFalse(jm.awaiting_startup_ack)
         self.assertEqual(jm.status, constants.STATUS.ready)
@@ -41,7 +41,7 @@ class TestCase(unittest.TestCase):
         name_mock.return_value = 'some_uuid'
         jm = jobmanager.JobManager()
 
-        self.assertEqual(jm.name, 'some_uuid')
+        self.assertEqual(jm.name.decode('ascii'), 'some_uuid')
 
         self.assertFalse(jm.awaiting_startup_ack)
         self.assertEqual(jm.status, constants.STATUS.ready)
diff --git a/eventmq/tests/test_scheduler.py b/eventmq/tests/test_scheduler.py
index a673561..dc96b09 100644
--- a/eventmq/tests/test_scheduler.py
+++ b/eventmq/tests/test_scheduler.py
@@ -29,7 +29,7 @@ class TestCase(unittest.TestCase):
             'NAME': 'RuckasBringer'
         }
         sched = scheduler.Scheduler(override_settings=override_settings)
-        self.assertEqual(sched.name, 'RuckasBringer:some_uuid')
+        self.assertEqual(sched.name.decode('ascii'), 'RuckasBringer:some_uuid')
 
         self.assertFalse(sched.awaiting_startup_ack)
         self.assertEqual(sched.status, constants.STATUS.ready)
diff --git a/eventmq/tests/test_sender.py b/eventmq/tests/test_sender.py
index f292696..f1a9984 100644
--- a/eventmq/tests/test_sender.py
+++ b/eventmq/tests/test_sender.py
@@ -35,7 +35,8 @@ class TestCase(unittest.TestCase):
 
         self.assert_(socket.poll() != 0)
         msg = socket.recv_multipart()
-        self.assertEqual(msg[0].decode('ascii'), self.sender.name)
+        self.assertEqual(msg[0].decode('ascii'),
+                         self.sender.name.decode('ascii'))
         self.assertEqual(msg[1], b'')
         self.assertEqual(msg[2], b'1')
         self.assertEqual(msg[3], b'Hello!')
diff --git a/eventmq/tests/utils.py b/eventmq/tests/utils.py
index 4ea8c6d..c93d488 100644
--- a/eventmq/tests/utils.py
+++ b/eventmq/tests/utils.py
@@ -37,7 +37,7 @@ class FakeDevice(ZMQReceiveMixin, ZMQSendMixin):
 
         self.name = generate_device_name()
         self.zsocket = zmq.Context.instance().socket(type_)
-        self.zsocket.setsockopt_string(zmq.IDENTITY, self.name)
+        self.zsocket.setsockopt(zmq.IDENTITY, self.name)
 
 
 def send_raw_INFORM(sock, type_, queues=(conf.DEFAULT_QUEUE_NAME,)):
diff --git a/eventmq/utils/devices.py b/eventmq/utils/devices.py
index d00815c..7fbb028 100644
--- a/eventmq/utils/devices.py
+++ b/eventmq/utils/devices.py
@@ -20,17 +20,19 @@
 
 def generate_device_name(prefix=None):
     """
-    This generates a uuid for use in setsockopt_string(zmq.IDENTITY, x)
-    Note: This will fail if used with python3 and setsockopt(zmq.IDENTIOTY, x)
+    This takes care of the python3 'everything is unicode' feature which
+    causes errors when setting the IDENTITY of the ZMQ socket.
 
     Args:
         prefix (str): Prefix the id with this string.
 
-    Returns (str) An ascii encoded string that can be used as an IDENTITY for a
-        ZMQ socket.
+    Returns (str/bytes) An ascii encoded string that can be used as an IDENTITY
+        for a ZMQ socket.  In python3 this returns a `bytes`, python2 a 'str
     """
     import uuid
     ret = str(uuid.uuid4())
+
     if prefix:
-        ret = prefix + ret
-    return ret
+        ret = "{}:{}".format(prefix, ret)
+
+    return ret.encode('ascii')