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

support isolated runs in py2 *and* py3 (for now)

Browse Source 
once we merge in runner support for isolated environments, we can
revert this commit (because we'll always run isolated code using python3
executables)
This commit is contained in:
Ryan Petrello 2019-01-14 14:43:03 -05:00
parent d273472927
commit 39d119534c
No known key found for this signature in database
GPG Key ID: F2AA5F2122351777
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
awx/main/expect/run.py
View File

@ -12,9 +12,12 @@ import pipes
import re
import signal
import sys
import _thread
import threading
import time
from io import StringIO
try:
from io import StringIO
except ImportError:
from StringIO import StringIO
import pexpect
import psutil
@ -48,7 +51,10 @@ def open_fifo_write(path, data):
reads data from the pipe.
'''
os.mkfifo(path, 0o600)
_thread.start_new_thread(lambda p, d: open(p, 'w').write(d), (path, data))
threading.Thread(
target=lambda p, d: open(p, 'w').write(d),
args=(path, data)
).start()
def run_pexpect(args, cwd, env, logfile,
@ -225,7 +231,11 @@ def handle_termination(pid, args, proot_cmd, is_cancel=True):
instance's cancel_flag.
'''
try:
if proot_cmd.encode('utf-8') in args:
if sys.version_info > (3, 0):
used_proot = proot_cmd.encode('utf-8') in args
else:
used_proot = proot_cmd in ' '.join(args)
if used_proot:
if not psutil:
os.kill(pid, signal.SIGKILL)
else: