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

The exception is properly caught inthe event system now

Browse Source
This commit is contained in:
Thomas S Hatch 2014-10-02 11:21:35 -06:00
parent a731b97737
commit 4502019340
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/client/__init__.py
View File

@ -791,17 +791,11 @@ class LocalClient(object):
if event is None: if event is None:
event = self.event event = self.event
while True: while True:
try: raw = event.get_event_noblock()
raw = event.get_event_noblock() if raw and raw.get('tag', '').startswith(jid):
if raw and raw.get('tag', '').startswith(jid): yield raw
yield raw else:
else: yield None
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( def get_iter_returns(
self, self,