darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 07:35:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into celery-send-sms-code

Browse Source 
Conflicts:
	tests/app/celery/test_tasks.py
This commit is contained in:
Rebecca Law
2016-02-17 15:43:57 +00:00
parent d022d036dc b98d8b9996
commit 7afa87c367
7 changed files with 74 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/celery/tasks.py
View File

@@ -1,5 +1,5 @@
from app import notify_celery, twilio_client, encryption
from app.clients.sms.twilio import TwilioClientException
from app import notify_celery, encryption, firetext_client
from app.clients.sms.firetext import FiretextClientException
from app.dao.templates_dao import get_model_templates
from app.dao.notifications_dao import save_notification
from app.models import Notification
@@ -23,8 +23,8 @@ def send_sms(service_id, notification_id, encrypted_notification):
save_notification(notification_db_object)
try:
twilio_client.send_sms(notification['to'], template.content)
except TwilioClientException as e:
firetext_client.send_sms(notification['to'], template.content)
except FiretextClientException as e:
current_app.logger.debug(e)
save_notification(notification_db_object, {"status": "failed"})