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

Clean up some notification task bugs

Browse Source
This commit is contained in:
Matthew Jones
2016-05-04 13:52:41 -04:00
parent 76ce77aaf7
commit e3f9b631e7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/tasks.py
View File

@@ -208,7 +208,7 @@ def handle_work_success(self, result, task_actual):
notification_body = instance.notification_data() notification_body = instance.notification_data()
notification_subject = "{} #{} '{}' succeeded on Ansible Tower: {}".format(friendly_name, notification_subject = "{} #{} '{}' succeeded on Ansible Tower: {}".format(friendly_name,
task_actual['id'], task_actual['id'],
instance_name, smart_text(instance_name),
notification_body['url']) notification_body['url'])
notification_body['friendly_name'] = friendly_name notification_body['friendly_name'] = friendly_name
send_notifications.delay([n.generate_notification(notification_subject, notification_body).id send_notifications.delay([n.generate_notification(notification_subject, notification_body).id
@@ -246,8 +246,8 @@ def handle_work_error(self, task_id, subtasks=None):
instance_name = instance.module_name instance_name = instance.module_name
notifiers = [] notifiers = []
friendly_name = "AdHoc Command" friendly_name = "AdHoc Command"
elif task_actual['type'] == 'system_job': elif each_task['type'] == 'system_job':
instance = SystemJob.objects.get(id=task_actual['id']) instance = SystemJob.objects.get(id=each_task['id'])
instance_name = instance.system_job_template.name instance_name = instance.system_job_template.name
notifiers = instance.system_job_template.notifiers notifiers = instance.system_job_template.notifiers
friendly_name = "System Job" friendly_name = "System Job"
@@ -270,7 +270,7 @@ def handle_work_error(self, task_id, subtasks=None):
notification_body = first_task.notification_data() notification_body = first_task.notification_data()
notification_subject = "{} #{} '{}' failed on Ansible Tower: {}".format(first_task_friendly_name, notification_subject = "{} #{} '{}' failed on Ansible Tower: {}".format(first_task_friendly_name,
first_task_id, first_task_id,
first_task_name, smart_text(first_task_name),
notification_body['url']) notification_body['url'])
notification_body['friendly_name'] = first_task_friendly_name notification_body['friendly_name'] = first_task_friendly_name
send_notifications.delay([n.generate_notification(notification_subject, notification_body).id send_notifications.delay([n.generate_notification(notification_subject, notification_body).id