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

Merge pull request #1750 from chrismeyersfsu/fix-ansible_hang

Browse Source 
fixes hanging chads, if chads were ansible
This commit is contained in:
Chris Meyers
2016-05-04 15:43:59 -04:00
parent 200ffaf7ca b18dd8fe21
commit 517da47655
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

@@ -558,7 +558,7 @@ class BaseTask(Task):
instance = self.update_model(instance.pk) instance = self.update_model(instance.pk)
if instance.cancel_flag: if instance.cancel_flag:
try: try:
if tower_settings.AWX_PROOT_ENABLED: if tower_settings.AWX_PROOT_ENABLED and self.should_use_proot(instance):
# NOTE: Refactor this once we get a newer psutil across the board # NOTE: Refactor this once we get a newer psutil across the board
if not psutil: if not psutil:
os.kill(child.pid, signal.SIGKILL) os.kill(child.pid, signal.SIGKILL)