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

avoid unrelated errors saving notification

Browse Source
This commit is contained in:
AlanCoding
2018-04-26 09:36:43 -04:00
parent ccada295ee
commit 52d8d851fe
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tasks.py
View File

@@ -270,6 +270,7 @@ def send_notifications(notification_list, job_id=None):
job_actual.notifications.add(*notifications) job_actual.notifications.add(*notifications)
for notification in notifications: for notification in notifications:
update_fields = ['status', 'notifications_sent']
try: try:
sent = notification.notification_template.send(notification.subject, notification.body) sent = notification.notification_template.send(notification.subject, notification.body)
notification.status = "successful" notification.status = "successful"
@@ -278,8 +279,9 @@ def send_notifications(notification_list, job_id=None):
logger.error(six.text_type("Send Notification Failed {}").format(e)) logger.error(six.text_type("Send Notification Failed {}").format(e))
notification.status = "failed" notification.status = "failed"
notification.error = smart_str(e) notification.error = smart_str(e)
update_fields.append('error')
finally: finally:
notification.save() notification.save(update_fields=update_fields)
@shared_task(bind=True, queue=settings.CELERY_DEFAULT_QUEUE) @shared_task(bind=True, queue=settings.CELERY_DEFAULT_QUEUE)