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

Merge pull request #326 from matburt/fix_cancel_behavior_in_proot

Browse Source 
Fix proot job cancel behavior
This commit is contained in:
Matthew Jones 2015-07-27 20:49:59 -04:00
commit e9370d0199
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/tasks.py
View File

@ -23,6 +23,7 @@ import uuid
from distutils.version import LooseVersion as Version
import dateutil.parser
import yaml
import psutil
# Pexpect
import pexpect
@ -432,7 +433,16 @@ class BaseTask(Task):
instance = self.update_model(instance.pk)
if instance.cancel_flag:
try:
os.kill(child.pid, signal.SIGINT)
if settings.AWX_PROOT_ENABLED:
main_proc = psutil.Process(pid=child.pid)
if hasattr(main_proc, "children"):
child_procs = main_proc.children(recursive=False)
else:
child_procs = main_proc.get_children(recursive=False)
for child_proc in child_procs:
os.kill(child_proc.pid, signal.SIGTERM)
else:
os.kill(child.pid, signal.SIGTERM)
time.sleep(3)
canceled = True
except OSError: