External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 00:08:44 -03:30
Code Issues Packages Projects Releases Wiki Activity

Emit websocket for approval node timeout

Browse Source 
...and update timeout_message to be more translation-friendly.
This commit is contained in:
beeankha
2019-08-29 14:30:33 -04:00
parent 9571801e9f
commit 2fc7e93c6a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/scheduler/task_manager.py
View File

@@ -527,11 +527,14 @@ class TaskManager():
if task.timeout == 0: if task.timeout == 0:
continue continue
if (now - task.created) >= approval_timeout_seconds: if (now - task.created) >= approval_timeout_seconds:
timeout_message = "The approval node {} ({}) has expired after {} seconds.".format(task.name, task.pk, task.timeout) timeout_message = _(
"The approval node {name} ({pk}) has expired after {timeout} seconds."
).format(name=task.name, pk=task.pk, timeout=task.timeout)
logger.warn(timeout_message) logger.warn(timeout_message)
task.timed_out = True task.timed_out = True
task.status = 'failed' task.status = 'failed'
task.job_explanation = _(timeout_message) task.websocket_emit_status(task.status)
task.job_explanation = timeout_message
task.save(update_fields=['status', 'job_explanation', 'timed_out']) task.save(update_fields=['status', 'job_explanation', 'timed_out'])
def calculate_capacity_consumed(self, tasks): def calculate_capacity_consumed(self, tasks):