darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-10 10:03:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	app/celery/tasks.py
	app/user/rest.py
	scripts/run_celery.sh
This commit is contained in:
Rebecca Law
2016-02-18 10:50:14 +00:00
parent c1df61a7d4 b286b4356c
commit aff948e9ca
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/celery/tasks.py
View File

@@ -34,12 +34,10 @@ def send_sms(service_id, notification_id, encrypted_notification):
@notify_celery.task(name='send-sms-code') @notify_celery.task(name='send-sms-code')
def send_sms_code(encrypted_notification): def send_sms_code(encrypted_verification):
notification = encryption.decrypt(encrypted_notification) verification_message = encryption.decrypt(encrypted_verification)
try: try:
response = firetext_client.send_sms(notification['to'], notification['secret_code']) firetext_client.send_sms(verification_message['to'], verification_message['secret_code'])
current_app.logger.info(response)
except FiretextClientException as e: except FiretextClientException as e:
current_app.logger.error(e) current_app.logger.error(e)

2
scripts/run_celery.sh
View File

@@ -3,4 +3,4 @@
set -e set -e
source environment.sh source environment.sh
celery -A run_celery.notify_celery worker --loglevel=INFO --logfile=/var/log/notify/application.log --concurrency=4 -Q sms,sms_code,email_code celery -A run_celery.notify_celery worker --loglevel=INFO --logfile=/var/log/notify/application.log --concurrency=4 -Q sms,sms-code,email-code

2
tests/app/celery/test_tasks.py
View File

@@ -87,7 +87,7 @@ def test_should_send_sms_code(mocker):
firetext_client.send_sms.assert_called_once_with(notification['to'], notification['secret_code']) firetext_client.send_sms.assert_called_once_with(notification['to'], notification['secret_code'])
def test_should_log_firetext_client_exception(mocker): def test_should_throw_firetext_client_exception(mocker):
notification = {'to': '+441234123123', notification = {'to': '+441234123123',
'secret_code': '12345'} 'secret_code': '12345'}