From cf3871473b9c1872701d9ca24017c1e1bc9a75bf Mon Sep 17 00:00:00 2001 From: David McDonald Date: Tue, 13 Oct 2020 11:05:28 +0100 Subject: [PATCH] Add workers for sms and email sending We want to have different workers for sending out email and sending out sms. This will enable us to better rate limit ourselves when sending to our providers. For example, we can make sure we only have capacity in the email worker to send at our rate of 500rps to SES. Note, we may in due time need to split the sms sender worker into two different workers, one for each provider. A separate PR will come after this to remove the unsplit `notify-delivery-worker-sender`. --- manifest.yml.j2 | 2 ++ scripts/paas_app_wrapper.sh | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/manifest.yml.j2 b/manifest.yml.j2 index f23ec08cd..552f1f8d2 100644 --- a/manifest.yml.j2 +++ b/manifest.yml.j2 @@ -53,6 +53,8 @@ 'notify-delivery-worker-jobs': {}, 'notify-delivery-worker-research': {}, 'notify-delivery-worker-sender': {'disk_quota': '2G', 'memory': '3G'}, + 'notify-delivery-worker-email': {'disk_quota': '2G', 'memory': '3G'}, + 'notify-delivery-worker-sms': {'disk_quota': '2G', 'memory': '3G'}, 'notify-delivery-worker-periodic': {}, 'notify-delivery-worker-reporting': { 'additional_env_vars': { diff --git a/scripts/paas_app_wrapper.sh b/scripts/paas_app_wrapper.sh index 9e4c7f3e0..ce965e5a7 100755 --- a/scripts/paas_app_wrapper.sh +++ b/scripts/paas_app_wrapper.sh @@ -24,6 +24,14 @@ case $NOTIFY_APP_NAME in exec scripts/run_multi_worker_app_paas.sh celery multi start 3 -c 10 -A run_celery.notify_celery --loglevel=INFO \ -Q send-sms-tasks,send-email-tasks ;; + delivery-worker-sender-sms) + exec scripts/run_multi_worker_app_paas.sh celery multi start 3 -c 10 -A run_celery.notify_celery --loglevel=INFO \ + -Q send-sms-tasks + ;; + delivery-worker-sender-email) + exec scripts/run_multi_worker_app_paas.sh celery multi start 3 -c 10 -A run_celery.notify_celery --loglevel=INFO \ + -Q send-email-tasks + ;; delivery-worker-periodic) exec scripts/run_app_paas.sh celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=2 \ -Q periodic-tasks 2> /dev/null