External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-02 03:48: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

29
awx/main/tasks.py
View File

@@ -430,30 +430,6 @@ def awx_periodic_scheduler(self):
state.save()
def _send_notification_templates(instance, status_str):
if status_str not in ['succeeded', 'failed']:
raise ValueError(_("status_str must be either succeeded or failed"))
try:
notification_templates = instance.get_notification_templates()
except Exception:
logger.warn("No notification template defined for emitting notification")
notification_templates = None
if notification_templates:
if status_str == 'succeeded':
notification_template_type = 'success'
else:
notification_template_type = 'error'
all_notification_templates = set(notification_templates.get(notification_template_type, []) + notification_templates.get('any', []))
if len(all_notification_templates):
try:
(notification_subject, notification_body) = getattr(instance, 'build_notification_%s_message' % status_str)()
except AttributeError:
raise NotImplementedError("build_notification_%s_message() does not exist" % status_str)
send_notifications.delay([n.generate_notification(notification_subject, notification_body).id
for n in all_notification_templates],
job_id=instance.id)
@shared_task(bind=True, queue='tower', base=LogErrorsTask)
def handle_work_success(self, result, task_actual):
try:
@@ -464,8 +440,6 @@ def handle_work_success(self, result, task_actual):
if not instance:
return
_send_notification_templates(instance, 'succeeded')
from awx.main.scheduler.tasks import run_job_complete
run_job_complete.delay(instance.id)
@@ -501,9 +475,6 @@ def handle_work_error(task_id, *args, **kwargs):
instance.save()
instance.websocket_emit_status("failed")
if first_instance:
_send_notification_templates(first_instance, 'failed')
# We only send 1 job complete message since all the job completion message
# handling does is trigger the scheduler. If we extend the functionality of
# what the job complete message handler does then we may want to send a