Update the logic for 'any' and 'started' notifications

This commit is contained in:
beeankha 2019-06-07 16:33:27 -04:00
parent d511d63a5a
commit c65e6ba30b

View File

@ -235,16 +235,18 @@ class JobNotificationMixin(object):
logger.warn("No notification template defined for emitting notification")
notification_templates = None
if notification_templates:
if status_str == 'succeeded':
all_notification_templates = set()
if status_str != 'running':
all_notification_templates.update(notification_templates.get('any', []))
notification_template_type = 'any'
elif status_str == 'succeeded':
notification_template_type = 'success'
elif status_str == 'running':
notification_template_type = 'started'
else:
notification_template_type = 'error'
all_notification_templates = set(notification_templates.get(notification_template_type, []))
all_notification_templates.update(notification_templates.get(notification_template_type, []))
if len(all_notification_templates):
if status_str != 'running':
all_notification_templates.update(notification_templates.get('any', []))
try:
(notification_subject, notification_body) = getattr(self, 'build_notification_%s_message' % status_str)()
except AttributeError: