openstack
/
oslo.messaging
Code Issues Proposed changes

Merge "[zmq] Fix timeout in ThreadingPoller.poll"

This commit is contained in:
Jenkins 2016-06-07 13:50:37 +00:00 committed by Gerrit Code Review
parent 390831efb2 fbf5cb442d
commit fc446c3854
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oslo_messaging/_drivers/zmq_driver/broker/zmq_queue_proxy.py
View File

@ -65,7 +65,7 @@ class UniversalQueueProxy(object):
{"router": self.be_router_address})
def run(self):
message, socket = self.poller.poll(self.conf.rpc_poll_timeout)
message, socket = self.poller.poll()
if message is None:
return

5
oslo_messaging/_drivers/zmq_driver/poller/threading_poller.py
View File

@ -38,9 +38,12 @@ class ThreadingPoller(zmq_poller.ZmqPoller):
self.poller.register(socket, zmq.POLLIN)
def poll(self, timeout=None):
if timeout is not None and timeout > 0:
timeout *= 1000 # convert seconds to milliseconds
sockets = {}
try:
sockets = dict(self.poller.poll())
sockets = dict(self.poller.poll(timeout=timeout))
except zmq.ZMQError as e:
LOG.debug("Polling terminated with error: %s", e)