External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Implement global job timeout mechanism.

Browse Source
This commit is contained in:
Aaron Tan
2016-09-15 14:56:27 -04:00
parent 2eda6b9528
commit 69be94feb9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/tasks.py
View File

@@ -517,8 +517,9 @@ class BaseTask(Task):
if pexpect_sleep is not None: if pexpect_sleep is not None:
logger.info("Suspending Job Execution for QA Work") logger.info("Suspending Job Execution for QA Work")
time.sleep(pexpect_sleep) time.sleep(pexpect_sleep)
# TODO: Update job_timeout using instance field instead. local_timeout = getattr(instance, 'timeout', 0)
job_timeout = 10 global_timeout = getattr(settings, 'JOB_TIMEOUT', 0)
job_timeout = global_timeout if local_timeout == 0 else local_timeout
child = pexpect.spawnu(args[0], args[1:], cwd=cwd, env=env) child = pexpect.spawnu(args[0], args[1:], cwd=cwd, env=env)
child.logfile_read = logfile child.logfile_read = logfile
canceled = False canceled = False