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

Set recursive on child process canceling

Browse Source 
Sometimes ansible spawns many subprocesses that can get orphaned and
stuck if we only kill the direct descendent child processes
This commit is contained in:
Matthew Jones
2015-08-05 11:44:50 -04:00
parent efcff9b5f7
commit ab042c269b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tasks.py
View File

@@ -442,9 +442,9 @@ class BaseTask(Task):
else:
main_proc = psutil.Process(pid=child.pid)
if hasattr(main_proc, "children"):
child_procs = main_proc.children(recursive=False)
child_procs = main_proc.children(recursive=True)
else:
child_procs = main_proc.get_children(recursive=False)
child_procs = main_proc.get_children(recursive=True)
for child_proc in child_procs:
os.kill(child_proc.pid, signal.SIGTERM)
else: