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

Fix psutil usage on el6 for job cancel

Browse Source 
psutil will fail to import on el6 due to not being able to access a
pseudo terminal.  This issues a SIGKILL to the proot process in order to
force the stop
This commit is contained in:
Matthew Jones 2015-08-05 11:20:48 -04:00
parent 31b8491d53
commit 3b96c3ca52
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tasks.py
View File

@ -23,6 +23,10 @@ import uuid
from distutils.version import LooseVersion as Version
import dateutil.parser
import yaml
try:
import psutil
except:
psutil = None
# Pexpect
import pexpect