Merge pull request #3093 from alphagov/broadcast-tasks-onto-worker

Broadcast tasks onto worker

app/broadcast_message/rest.py

@@ -210,5 +210,5 @@ def _create_broadcast_event(broadcast_message):
 
     send_broadcast_event.apply_async(
         kwargs={'broadcast_event_id': str(event.id)},
-        queue=QueueNames.NOTIFY
+        queue=QueueNames.BROADCASTS
     )

app/celery/broadcast_message_tasks.py

@@ -23,7 +23,7 @@ def send_broadcast_event(broadcast_event_id):
     for provider in broadcast_event.service.get_available_broadcast_providers():
         send_broadcast_provider_message.apply_async(
             kwargs={'broadcast_event_id': broadcast_event_id, 'provider': provider},
-            queue=QueueNames.NOTIFY
+            queue=QueueNames.BROADCASTS
         )
 
 

app/celery/scheduled_tasks.py

@@ -309,4 +309,4 @@ def send_canary_to_cbc_proxy():
 def trigger_link_tests():
     if current_app.config['CBC_PROXY_ENABLED']:
         for cbc_name in current_app.config['ENABLED_CBCS']:
-            trigger_link_test.apply_async(kwargs={'provider': cbc_name}, queue=QueueNames.NOTIFY)
+            trigger_link_test.apply_async(kwargs={'provider': cbc_name}, queue=QueueNames.BROADCASTS)

app/config.py

@@ -33,6 +33,7 @@ class QueueNames(object):
     SANITISE_LETTERS = 'sanitise-letter-tasks'
     SAVE_API_EMAIL = 'save-api-email-tasks'
     SAVE_API_SMS = 'save-api-sms-tasks'
+    BROADCASTS = 'broadcast-tasks'
 
     @staticmethod
     def all_queues():
@@ -52,7 +53,8 @@ class QueueNames(object):
             QueueNames.LETTERS,
             QueueNames.SMS_CALLBACKS,
             QueueNames.SAVE_API_EMAIL,
-            QueueNames.SAVE_API_SMS
+            QueueNames.SAVE_API_SMS,
+            QueueNames.BROADCASTS,
         ]