Update for new config stuf

Author: AlanCoding

ansible_base/task/__init__.py

@@ -8,14 +8,19 @@ def get_config():
     psycopg_params.pop('context')  # TODO: remove in inner method, makes non-async, not good
 
     return {
+        "version": 2,
+        "brokers": {
+            "pg_notify": {
+                "config": psycopg_params
+                # TODO: hook in synchronous connection factory
+            }
+        },
         "producers": {
-            "brokers": {
-                "pg_notify": psycopg_params,
-                "channels": ["dab_broadcast"],
-            },
-            "scheduled": {
-                "ansible_base.task.tasks.run_task_from_queue": {"schedule": 60},
-                "ansible_base.task.tasks.manage_lost_tasks": {"schedule": 60*10}
+            "ScheduledProducer": {
+                "task_schedule": {
+                    "ansible_base.task.tasks.run_task_from_queue": {"schedule": 60},
+                    "ansible_base.task.tasks.manage_lost_tasks": {"schedule": 60*10}
+                }
             },
         },
         "pool": {"max_workers": 4},  # TODO: to settings

ansible_base/task/apps.py

@@ -1,8 +1,16 @@
 from django.apps import AppConfig
 
+from dispatcher.config import setup
+
+from ansible_base.task import get_config
+
 
 class TaskConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'ansible_base.task'
     label = 'dab_tas'
     verbose_name = 'DAB tasking system'
+
+    def ready(self):
+        # Set up dispatcher
+        setup(get_config())

ansible_base/task/management/commands/run_dispatcher.py

@@ -1,9 +1,6 @@
-import asyncio
 import logging
 
-from dispatcher.main import DispatcherMain
-
-from ansible_base.task import get_config
+from dispatcher import run_service
 
 from django.core.management.base import BaseCommand
 from django.db import connection
@@ -16,17 +13,9 @@ class Command(BaseCommand):
     help = "Runs bug checking sanity checks, gets scale metrics, and recommendations for Role Based Access Control"
 
     def handle(self, *args, **options):
-        dispatcher_config = get_config()
-
-        loop = asyncio.get_event_loop()
-        dispatcher = DispatcherMain(dispatcher_config)
-
         # Borrowed from eda-server, ensure the database connection is closed
         connection.close()
         cache.close()
-        try:
-            loop.run_until_complete(dispatcher.main())
-        except KeyboardInterrupt:
-            logger.info("run_worker_dispatch entry point leaving")
-        finally:
-            loop.close()
+
+        # Configuration is already handled in app .ready method
+        run_service()