valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16344 from thatch45/gate_zmq

Browse Source 
gate the zmq call
This commit is contained in:
Thomas S Hatch 2014-10-03 00:09:23 -06:00
commit 34cb47c7b3
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
salt/client/__init__.py
View File

@ -46,8 +46,9 @@ from salt.exceptions import (
# Import third party libs
try:
import zmq
HAS_ZMQ = True
except ImportError:
pass
HAS_ZMQ = False
# Try to import range from https://github.com/ytoolshed/range
HAS_RANGE = False
@ -791,17 +792,24 @@ class LocalClient(object):
if event is None:
event = self.event
while True:
try:
if HAS_ZMQ:
try:
raw = event.get_event_noblock()
if raw and raw.get('tag', '').startswith(jid):
yield raw
else:
yield None
except zmq.ZMQError as ex:
if ex.errno == errno.EAGAIN or ex.errno == errno.EINTR:
yield None
else:
raise
else:
raw = event.get_event_noblock()
if raw and raw.get('tag', '').startswith(jid):
yield raw
else:
yield None
except zmq.ZMQError as ex:
if ex.errno == errno.EAGAIN or ex.errno == errno.EINTR:
yield None
else:
raise
def get_iter_returns(
self,