From 2fc7e93c6a88ae896ca0eda97a7583f8fde302b0 Mon Sep 17 00:00:00 2001 From: beeankha Date: Thu, 29 Aug 2019 14:30:33 -0400 Subject: [PATCH] Emit websocket for approval node timeout ...and update timeout_message to be more translation-friendly. --- awx/main/scheduler/task_manager.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/awx/main/scheduler/task_manager.py b/awx/main/scheduler/task_manager.py index df02d6f030..3d89d6aecc 100644 --- a/awx/main/scheduler/task_manager.py +++ b/awx/main/scheduler/task_manager.py @@ -527,11 +527,14 @@ class TaskManager(): if task.timeout == 0: continue 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) task.timed_out = True 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']) def calculate_capacity_consumed(self, tasks):