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

Set default value is 0 for idle_timeout

Browse Source
This commit is contained in:
Alexander Komarov
2021-08-19 14:48:11 +05:00
parent aa682fa2c9
commit 530977d6b3
7 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/conf.py
View File

@@ -412,9 +412,12 @@ register(
'DEFAULT_JOB_IDLE_TIMEOUT',
field_class=fields.IntegerField,
min_value=0,
default=600,
default=0,
label=_('Default Job Idle Timeout'),
help_text=_('If no output is detected from ansible in this number of seconds the execution will be terminated.'),
help_text=_(
'If no output is detected from ansible in this number of seconds the execution will be terminated. '
'Use value of 0 to used default idle_timeout is 600s.'
),
category=_('Jobs'),
category_slug='jobs',
unit=_('seconds'),

4
awx/main/tasks.py
View File

@@ -1365,11 +1365,13 @@ class BaseTask(object):
'envvars': env,
'settings': {
'job_timeout': self.get_instance_timeout(self.instance),
'idle_timeout': settings.DEFAULT_JOB_IDLE_TIMEOUT,
'suppress_ansible_output': True,
},
}
if settings.DEFAULT_JOB_IDLE_TIMEOUT > 0:
params['settings']['idle_timeout'] = settings.DEFAULT_JOB_IDLE_TIMEOUT
if isinstance(self.instance, AdHocCommand):
params['module'] = self.build_module_name(self.instance)
params['module_args'] = self.build_module_args(self.instance)