External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-21 15:57:52 -02:30
Code Issues Packages Projects Releases Wiki Activity

Enable canceling on certain levels.... fix up some unit tests

Browse Source
This commit is contained in:
Matthew Jones
2014-01-30 10:54:54 -05:00
parent 6afc584a4f
commit 280527f993
4 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/tasks.py
View File

@@ -237,12 +237,10 @@ class BaseTask(Task):
if logfile_pos != logfile.tell():
logfile_pos = logfile.tell()
last_stdout_update = time.time()
#TODO: Find replacement for cancel flag
#TODO: Something about checking celery status
# if instance.cancel_flag:
# child.close(True)
# canceled = True
# FIXME: Find a way to determine if task is hung waiting at a prompt.
# NOTE: In case revoke doesn't have an affect
if instance.cancel_flag:
child.close(True)
canceled = True
if idle_timeout and (time.time() - last_stdout_update) > idle_timeout:
child.close(True)
canceled = True