From 06a849be09df9923ed8a93fefd0f6b31a0340e90 Mon Sep 17 00:00:00 2001 From: Roman Kournjaev Date: Fri, 26 Dec 2014 17:35:46 -0800 Subject: [PATCH] fixing sending alert when one fails all fail --- cabot/cabotapp/alert.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/cabot/cabotapp/alert.py b/cabot/cabotapp/alert.py index 93d2db7..2d82bc0 100644 --- a/cabot/cabotapp/alert.py +++ b/cabot/cabotapp/alert.py @@ -33,13 +33,25 @@ telephone_template = "This is an urgent message from Arachnys monitoring. Servic def send_alert(service, duty_officers=None): users = service.users_to_notify.all() if service.email_alert: - send_email_alert(service, users, duty_officers) + try: + send_email_alert(service, users, duty_officers) + except Exception: + logging.exception('Could not send EMAIL alert') if service.hipchat_alert: - send_hipchat_alert(service, users, duty_officers) + try: + send_hipchat_alert(service, users, duty_officers) + except Exception: + logging.exception('Could not send HIPCHAT alert') if service.sms_alert: - send_sms_alert(service, users, duty_officers) + try: + send_sms_alert(service, users, duty_officers) + except Exception: + logging.exception('Could not send sms alert') if service.telephone_alert: - send_telephone_alert(service, users, duty_officers) + try: + send_telephone_alert(service, users, duty_officers) + except Exception: + logging.exception('Could not send telephone alert') def send_email_alert(service, users, duty_officers):