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

send job notification templates _after_ all events have been processed

Browse Source 
see: https://github.com/ansible/awx/issues/500
This commit is contained in:
Ryan Petrello
2018-03-21 17:43:26 -04:00
parent 724812e87c
commit f59f47435b
5 changed files with 59 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,6 @@ from awx.main.utils import get_type_for_model
from awx.main.signals import disable_activity_stream
from awx.main.scheduler.dependency_graph import DependencyGraph
from awx.main import tasks as awx_tasks
from awx.main.utils import decrypt_field
# Celery
@@ -499,7 +498,8 @@ class TaskManager():
except DatabaseError:
logger.error("Task {} DB error in marking failed. Job possibly deleted.".format(task.log_format))
continue
awx_tasks._send_notification_templates(task, 'failed')
if hasattr(task, 'send_notification_templates'):
task.send_notification_templates('failed')
task.websocket_emit_status(new_status)
logger.error("{}Task {} has no record in celery. Marking as failed".format(
'Isolated ' if isolated else '', task.log_format))
@@ -630,4 +630,4 @@ class TaskManager():
# Operations whose queries rely on modifications made during the atomic scheduling session
for wfj in WorkflowJob.objects.filter(id__in=finished_wfjs):
awx_tasks._send_notification_templates(wfj, 'succeeded' if wfj.status == 'successful' else 'failed')
wfj.send_notification_templates('succeeded' if wfj.status == 'successful' else 'failed')