diff --git a/README.md b/README.md index 66fdd02615..26e1a18155 100644 --- a/README.md +++ b/README.md @@ -110,11 +110,7 @@ file. Copy that file to `.env` and customize it to your needs. ## To run the queues ``` -scripts/run_celery.sh -``` - -``` -scripts/run_celery_sms.sh +scripts/run_celery_local.sh ``` ``` @@ -179,7 +175,7 @@ To help debug full code paths of emails and SMS, we have a special email and pho set in the application's configuration. As it stands at the moment these are the following: | Notification Type | Test destination | -|-------------------|--------------------------| +| ----------------- | ------------------------ | | Email | internal.test@cds-snc.ca | | SMS | +16135550123 | diff --git a/app/config.py b/app/config.py index f66b95ca85..4a11187c90 100644 --- a/app/config.py +++ b/app/config.py @@ -87,11 +87,6 @@ class QueueNames(object): SEND_SMS_MEDIUM = "send-sms-medium" SEND_SMS_LOW = "send-sms-low" - # Queues for sending all emails. - SEND_EMAIL_HIGH = "send-email-high" - SEND_EMAIL_MEDIUM = "send-email-medium" - SEND_EMAIL_LOW = "send-email-low" - # TODO: Delete this queue once we verify that it is not used anymore. SEND_SMS = "send-sms-tasks" @@ -99,6 +94,11 @@ class QueueNames(object): # we have a limit to send per second and hence, needs to be throttled. SEND_THROTTLED_SMS = "send-throttled-sms-tasks" + # Queues for sending all emails. + SEND_EMAIL_HIGH = "send-email-high" + SEND_EMAIL_MEDIUM = "send-email-medium" + SEND_EMAIL_LOW = "send-email-low" + # TODO: Delete this queue once we verify that it is not used anymore. SEND_EMAIL = "send-email-tasks" diff --git a/scripts/run_celery_no_sending.sh b/scripts/run_celery_no_sending.sh index 37669f15b9..8c7fad7d5b 100755 --- a/scripts/run_celery_no_sending.sh +++ b/scripts/run_celery_no_sending.sh @@ -1,6 +1,6 @@ #!/bin/sh -# runs celery with all celery queues except send-throttled-sms-tasks, send-sms-tasks, send-sms-high, send-sms-medium, or send-sms-low +# runs celery with all celery queues except send-throttled-sms-tasks, send-sms-* and send-email-* set -e