shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

Merge pull request #1588 from AlanCoding/notification_update_fields

Browse Source 
Avoid unrelated errors saving notification
This commit is contained in:
Alan Rominger 2018-04-26 10:19:40 -04:00 committed by GitHub
commit 074302b573
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats 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)
for notification in notifications:
update_fields = ['status', 'notifications_sent']
try:
sent = notification.notification_template.send(notification.subject, notification.body)
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))
notification.status = "failed"
notification.error = smart_str(e)
update_fields.append('error')
finally:
notification.save()
notification.save(update_fields=update_fields)
@shared_task(bind=True, queue=settings.CELERY_DEFAULT_QUEUE)