saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #24405 from jacksontj/2014.7

Browse source 
Fix for #24276
This commit is contained in:
Thomas S Hatch 2015-06-04 14:50:42 -06:00
commit 83f853b6ea
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/utils/event.py
View file

@ -284,12 +284,11 @@ class SaltEvent(object):
start = time.time()
timeout_at = start + wait
while not wait or time.time() <= timeout_at:
# convert to milliseconds
socks = dict(self.poller.poll(wait * 1000))
if socks.get(self.sub) != zmq.POLLIN:
continue
try:
# convert to milliseconds
socks = dict(self.poller.poll(wait * 1000))
if socks.get(self.sub) != zmq.POLLIN:
continue
# Please do not use non-blocking mode here.
# Reliability is more important than pure speed on the event bus.
ret = self.get_event_block()