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 #29642 from cachedout/issue_29199

Browse source 
Correctly restart deamonized minions on failure
This commit is contained in:
Mike Place 2015-12-15 12:02:40 -07:00
commit 7c38dec0ad
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/scripts.py
View file

@ -94,7 +94,11 @@ def minion_process(queue):
random_delay = randint(1, delay)
log.info('Sleeping random_reauth_delay of {0} seconds'.format(random_delay))
# preform delay after minion resources have been cleaned
queue.put(random_delay)
if minion.options.daemon:
time.sleep(random_delay)
salt_minion()
else:
queue.put(random_delay)
else:
queue.put(0)