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

ensure that the celery workers know about the new db-letter queue

Browse Source 
this fixes running locally and on paas, a separate PR is in
notifications-aws to fix work on aws
This commit is contained in:
Leo Hemsted
2017-01-24 10:53:41 +00:00
parent 4f238d241a
commit 70cd3fb335
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/celery/tasks.py
View File

@@ -51,7 +51,7 @@ def process_job(job_id):
db_template = dao_get_template_by_id(job.template_id, job.template_version)
TemplateClass = get_template_class(db_template)
TemplateClass = get_template_class(db_template.template_type)
template = TemplateClass(db_template.__dict__)
for row_number, recipient, personalisation in RecipientCSV(
@@ -266,10 +266,10 @@ def handle_exception(task, notification, notification_id, exc):
current_app.logger.exception('Retry' + retry_msg)
def get_template_class(template):
if template.template_type == SMS_TYPE:
def get_template_class(template_type):
if template_type == SMS_TYPE:
return SMSMessageTemplate
elif template.template_type in (EMAIL_TYPE, LETTER_TYPE):
elif template_type in (EMAIL_TYPE, LETTER_TYPE):
# since we don't need rendering capabilities (we only need to extract placeholders) both email and letter can
# use the same base template
return WithSubjectTemplate

6
app/config.py
View File

@@ -167,8 +167,9 @@ class Development(Config):
SQLALCHEMY_ECHO = False
CELERY_QUEUES = Config.CELERY_QUEUES + [
Queue('db-sms', Exchange('default'), routing_key='db-sms'),
Queue('send-sms', Exchange('default'), routing_key='send-sms'),
Queue('db-email', Exchange('default'), routing_key='db-email'),
Queue('db-letter', Exchange('default'), routing_key='db-letter'),
Queue('send-sms', Exchange('default'), routing_key='send-sms'),
Queue('send-email', Exchange('default'), routing_key='send-email'),
Queue('research-mode', Exchange('default'), routing_key='research-mode')
]
@@ -186,8 +187,9 @@ class Test(Config):
STATSD_PORT = 1000
CELERY_QUEUES = Config.CELERY_QUEUES + [
Queue('db-sms', Exchange('default'), routing_key='db-sms'),
Queue('send-sms', Exchange('default'), routing_key='send-sms'),
Queue('db-email', Exchange('default'), routing_key='db-email'),
Queue('db-letter', Exchange('default'), routing_key='db-letter'),
Queue('send-sms', Exchange('default'), routing_key='send-sms'),
Queue('send-email', Exchange('default'), routing_key='send-email'),
Queue('research-mode', Exchange('default'), routing_key='research-mode')
]

2
manifest-delivery-worker-database.yml
View File

@@ -14,6 +14,6 @@ applications:
- hosted-graphite
instances: 2
memory: 256M
command: celery -A aws_run_celery.notify_celery worker --loglevel=INFO --concurrency=11 -Q db-sms,db-email
command: celery -A aws_run_celery.notify_celery worker --loglevel=INFO --concurrency=11 -Q db-sms,db-email,db-letter
env:
NOTIFY_APP_NAME: delivery-worker-database

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

@@ -794,10 +794,6 @@ def test_should_use_email_template_and_persist_without_personalisation(sample_em
queue='send-email')
class MyException(Exception):
pass
def test_send_sms_should_go_to_retry_queue_if_database_errors(sample_template, mocker):
notification = _notification_json(sample_template, "+447234123123")
@@ -933,5 +929,4 @@ def test_persist_letter_saves_letter_to_database(sample_letter_job, mocker):
(LETTER_TYPE, WithSubjectTemplate),
])
def test_get_template_class(template_type, expected_class):
template = Mock(template_type=template_type)
assert get_template_class(template) == expected_class
assert get_template_class(template_type) == expected_class