External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-15 13:27:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Silently ignore psutil errors when the process is already gone

Browse Source 
During ssh CP cleanuip
This commit is contained in:
Matthew Jones
2017-01-30 13:38:38 -05:00
parent 96dac001ed
commit d9a7f2fadb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/lib/tower_display_callback/cleanup.py
View File

@@ -71,7 +71,10 @@ def terminate_ssh_control_masters():
# Terminate then kill control master processes. Workaround older # Terminate then kill control master processes. Workaround older
# version of psutil that may not have wait_procs implemented. # version of psutil that may not have wait_procs implemented.
for proc in ssh_cm_procs: for proc in ssh_cm_procs:
proc.terminate() try:
proc.terminate()
except psutil.NoSuchProcess:
continue
procs_gone, procs_alive = psutil.wait_procs(ssh_cm_procs, timeout=5) procs_gone, procs_alive = psutil.wait_procs(ssh_cm_procs, timeout=5)
for proc in procs_alive: for proc in procs_alive:
proc.kill() proc.kill()