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

Adjusted try/except statements on process checking

Browse source
This commit is contained in:
David Murphy 2019-07-29 11:01:23 -06:00
parent e189177302
commit 2d20fbe6a5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/utils/process.py
View file

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