External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-25 04:45:03 -02:30
Code Issues Packages Projects Releases Wiki Activity

Handle psutil errors when terminating tasks.

Browse Source
This commit is contained in:
Chris Church
2016-12-14 16:37:44 -05:00
parent e8f01c9029
commit 9c444e084e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks.py
View File

@@ -618,7 +618,7 @@ class BaseTask(Task):
for child_proc in child_procs: for child_proc in child_procs:
os.kill(child_proc.pid, signal.SIGKILL) os.kill(child_proc.pid, signal.SIGKILL)
os.kill(main_proc.pid, signal.SIGKILL) os.kill(main_proc.pid, signal.SIGKILL)
except TypeError: except (TypeError, psutil.Error):
os.kill(job.pid, signal.SIGKILL) os.kill(job.pid, signal.SIGKILL)
else: else:
os.kill(job.pid, signal.SIGTERM) os.kill(job.pid, signal.SIGTERM)