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

Don't spin waiting for runner return, just use get_event (it has a poller)

Browse Source 
Conflicts:
	salt/runner.py
This commit is contained in:
Thomas Jackson 2015-01-10 00:17:50 -08:00
parent eff95e8b1d
commit 7abf26ed59
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/client/mixins.py
View File

@ -77,15 +77,15 @@ class SyncClientMixin(object):
job = self.master_call(**low)
ret_tag = salt.utils.event.tagify('ret', base=job['tag'])
timelimit = time.time() + (timeout or 300)
while True:
ret = self.event.get_event(tag=ret_tag, full=True, wait=timelimit)
if ret is None:
raise salt.exceptions.SaltClientTimeout(
"RunnerClient job '{0}' timed out".format(job['jid']),
jid=job['jid'])
if timeout is None:
timeout = 300
ret = self.event.get_event(tag=ret_tag, full=True, wait=timeout)
if ret is None:
raise salt.exceptions.SaltClientTimeout(
"RunnerClient job '{0}' timed out".format(job['jid']),
jid=job['jid'])
return ret['data']['return']
return ret['data']['return']
def cmd(self, fun, arg=None, pub_data=None, kwarg=None):
'''