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

Don't restart processes if the manager is not set to restart them

Browse source
This commit is contained in:
Pedro Algarvio 2016-08-02 18:19:34 +01:00
parent dd91006ed7
commit 7b8bf2d2b4
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/utils/process.py
View file

@ -328,6 +328,8 @@ class ProcessManager(object):
'''
Create new process (assuming this one is dead), then remove the old one
'''
if self._restart_processes is False:
return
log.info('Process {0} ({1}) died with exit status {2},'
' restarting...'.format(self._process_map[pid]['tgt'],
pid,
@ -383,7 +385,8 @@ class ProcessManager(object):
log.debug('Process of pid {0} died, not a known'
' process, will not restart'.format(pid))
continue
self.restart_process(pid)
if self._restart_processes is True:
self.restart_process(pid)
elif async is True:
yield gen.sleep(10)
elif async is False: