From a504343623f01c3e1b1162d7dfcb4d2c15b042d2 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Fri, 30 Sep 2016 11:14:36 +0100 Subject: [PATCH 1/3] Research mode will have own worker so removed from default config. this means normal celery workers WON'T process this queue. Requires a dedicated celery worker to do this. - note development and test configs add it in so DEV and TEST builds require no change. --- config.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config.py b/config.py index ec10c8515..fa676c79c 100644 --- a/config.py +++ b/config.py @@ -117,7 +117,6 @@ class Config(object): CELERY_QUEUES = [ Queue('periodic', Exchange('default'), routing_key='periodic'), Queue('process-job', Exchange('default'), routing_key='process-job'), - Queue('research-mode', Exchange('default'), routing_key='research-mode'), Queue('retry', Exchange('default'), routing_key='retry'), Queue('notify', Exchange('default'), routing_key='notify') ] @@ -156,7 +155,8 @@ class Development(Config): 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('send-email', Exchange('default'), routing_key='send-email') + Queue('send-email', Exchange('default'), routing_key='send-email'), + Queue('research-mode', Exchange('default'), routing_key='research-mode') ] @@ -173,7 +173,8 @@ class Test(Config): 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('send-email', Exchange('default'), routing_key='send-email') + Queue('send-email', Exchange('default'), routing_key='send-email'), + Queue('research-mode', Exchange('default'), routing_key='research-mode') ] From 6ce85878d856dd217ba781f984505e03d8d11760 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Fri, 30 Sep 2016 11:23:54 +0100 Subject: [PATCH 2/3] Added start for research mode worker --- scripts/aws_start_app.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/aws_start_app.sh b/scripts/aws_start_app.sh index 9e871ebc2..0c48d4859 100755 --- a/scripts/aws_start_app.sh +++ b/scripts/aws_start_app.sh @@ -15,5 +15,6 @@ function start start "notifications-api" start "notifications-api-celery-worker" start "notifications-api-celery-worker-sender" +start "notifications-api-celery-worker-research" start "notifications-api-celery-worker-db" start "notifications-api-celery-beat" From 19f2a6cb65a128aec39d801f92d345044d24d7fd Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Fri, 30 Sep 2016 11:25:12 +0100 Subject: [PATCH 3/3] Added stop for research mode worker --- scripts/aws_stop_app.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/aws_stop_app.sh b/scripts/aws_stop_app.sh index f3c3a441a..4ccc4ebc9 100755 --- a/scripts/aws_stop_app.sh +++ b/scripts/aws_stop_app.sh @@ -19,4 +19,5 @@ stop "notifications-api" stop "notifications-api-celery-beat" stop "notifications-api-celery-worker" stop "notifications-api-celery-worker-sender" +stop "notifications-api-celery-worker-research" stop "notifications-api-celery-worker-db"