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

Updated for review comments

Browse source
This commit is contained in:
David Murphy 2019-07-25 18:07:37 -06:00
parent 68c29af9ed
commit 2e3ca43e0d
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/utils/process.py
View file

@ -807,15 +807,15 @@ class SignalHandlingMultiprocessingProcess(MultiprocessingProcess):
msg += '. Exiting'
log.debug(msg)
if HAS_PSUTIL:
for process in psutil.process_iter():
if process == self.pid and hasattr(process, 'children'):
if psutil.pid_exists(self.pid):
process = psutil.Process(self.pid)
if hasattr(process, 'children'):
try:
for child in process.children(recursive=True):
if child.is_running():
child.terminate()
except psutil.NoSuchProcess:
pass
break
sys.exit(salt.defaults.exitcodes.EX_OK)
def start(self):