diff options
| author | David Hurst | 2017-05-12 12:12:42 -0600 |
|---|---|---|
| committer | GitHub | 2017-05-12 12:12:42 -0600 |
| commit | f3da7ca5ca56d2ab6ee25ea616cde75084e05158 (patch) | |
| tree | 57d9cc07ddf48d18c45a1cb6d3a4958d6a91a929 | |
| parent | cd32758c02e5ea1ce1c1259fbe524afe6c6e0425 (diff) | |
| parent | d30780deb9490522221c26a465de2e1b51b27241 (diff) | |
| download | eventmq-f3da7ca5ca56d2ab6ee25ea616cde75084e05158.tar.gz eventmq-f3da7ca5ca56d2ab6ee25ea616cde75084e05158.zip | |
Merge pull request #40 from sideshowdave7/master
Ensure a new uuid is generated each time a sender disconnects and tries reconnecting
| -rw-r--r-- | eventmq/__init__.py | 2 | ||||
| -rw-r--r-- | eventmq/sender.py | 3 | ||||
| -rw-r--r-- | setup.py | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/eventmq/__init__.py b/eventmq/__init__.py index 866c8ec..60bb61c 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.4.5' | 2 | __version__ = '0.3.4.6' |
| 3 | 3 | ||
| 4 | PROTOCOL_VERSION = 'eMQP/1.0' | 4 | PROTOCOL_VERSION = 'eMQP/1.0' |
| 5 | 5 | ||
diff --git a/eventmq/sender.py b/eventmq/sender.py index f0cc09c..12dec05 100644 --- a/eventmq/sender.py +++ b/eventmq/sender.py | |||
| @@ -138,6 +138,9 @@ class Sender(ZMQSendMixin, ZMQReceiveMixin): | |||
| 138 | self.zsocket.close() | 138 | self.zsocket.close() |
| 139 | 139 | ||
| 140 | self.zsocket = kwargs.pop('socket', self.zcontext.socket(zmq.DEALER)) | 140 | self.zsocket = kwargs.pop('socket', self.zcontext.socket(zmq.DEALER)) |
| 141 | |||
| 142 | self.name = kwargs.pop('name', str(uuid.uuid4())) | ||
| 143 | |||
| 141 | if sys.version[0] == '2': | 144 | if sys.version[0] == '2': |
| 142 | self.zsocket.setsockopt(zmq.IDENTITY, self.name) | 145 | self.zsocket.setsockopt(zmq.IDENTITY, self.name) |
| 143 | else: | 146 | else: |
| @@ -7,7 +7,7 @@ from setuptools import find_packages, setup | |||
| 7 | 7 | ||
| 8 | setup( | 8 | setup( |
| 9 | name='eventmq', | 9 | name='eventmq', |
| 10 | version='0.3.4.5', | 10 | version='0.3.4.6', |
| 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', |