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

Start pinging minions after TIMEOUT, instead of immediately

Browse Source
This commit is contained in:
Thomas Jackson 2014-09-23 18:50:50 -07:00
parent 3773b02489
commit 0d0f3e63af
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/client/__init__.py
View File

@ -841,8 +841,8 @@ class LocalClient(object):
# iterator for this job's return
ret_iter = self.get_returns_no_block(jid)
# iterator for the info of this job
jinfo_iter = None
jinfo_timeout = None
jinfo_iter = []
jinfo_timeout = time.time() + timeout
while True:
# Process events until timeout is reached or all minions have returned
for raw in ret_iter:
@ -888,7 +888,7 @@ class LocalClient(object):
minion_timeouts[id_] = time.time() + timeout
# if we don't have the job info iterator (or its timed out), lets make it
if jinfo_iter is None or time.time() > jinfo_timeout:
if time.time() > jinfo_timeout:
# need our own event listener, so we don't clobber the class one
event = salt.utils.event.get_event(
'master',