From 3cb3cf438ec905d7050572d8804310b6b67db3f9 Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Mon, 31 Jul 2017 13:29:30 +0100
Subject: [PATCH] remove SEND_COMBINED

---
 app/config.py              | 2 --
 manifest-delivery-base.yml | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/config.py b/app/config.py
index 5d71c0f41..cfd37fa33 100644
--- a/app/config.py
+++ b/app/config.py
@@ -22,7 +22,6 @@ class QueueNames(object):
     PERIODIC = 'periodic-tasks'
     PRIORITY = 'priority-tasks'
     DATABASE = 'database-tasks'
-    SEND_COMBINED = 'send-tasks'
     SEND_SMS = 'send-sms-tasks'
     SEND_EMAIL = 'send-email-tasks'
     RESEARCH_MODE = 'research-mode-tasks'
@@ -38,7 +37,6 @@ class QueueNames(object):
             QueueNames.PRIORITY,
             QueueNames.PERIODIC,
             QueueNames.DATABASE,
-            QueueNames.SEND_COMBINED,
             QueueNames.SEND_SMS,
             QueueNames.SEND_EMAIL,
             QueueNames.RESEARCH_MODE,
diff --git a/manifest-delivery-base.yml b/manifest-delivery-base.yml
index 6fba774ea..78053a729 100644
--- a/manifest-delivery-base.yml
+++ b/manifest-delivery-base.yml
@@ -33,7 +33,7 @@ applications:
       NOTIFY_APP_NAME: delivery-worker-research
 
   - name: notify-delivery-worker-sender
-    command: scripts/run_app_paas.sh celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=11 -Q send-tasks,send-sms-tasks,send-email-tasks
+    command: scripts/run_app_paas.sh celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=11 -Q send-sms-tasks,send-email-tasks
     env:
       NOTIFY_APP_NAME: delivery-worker-sender