Update deps and fix starting tasks (#16)

BlueBrain · Jul 15, 2024 · 472ffc0 · 472ffc0
1 parent 370a6d2
commit 472ffc0
Show file tree

Hide file tree

Showing 3 changed files with 110 additions and 167 deletions.
diff --git a/app/__main__.py b/app/__main__.py
@@ -9,6 +9,8 @@
 from app.config import settings
 from app.db.session import database_session_manager
 from app.logger import configure_logging
+from app.tasks.charger.long_jobs import PeriodicLongJobsCharger
+from app.tasks.charger.short_jobs import PeriodicShortJobsCharger
 from app.tasks.charger.storage import PeriodicStorageCharger
 from app.tasks.consumer.long_jobs import LongJobsQueueConsumer
 from app.tasks.consumer.short_jobs import ShortJobsQueueConsumer
@@ -33,32 +35,32 @@ async def main() -> None:
             log_config=settings.LOGGING_CONFIG,
         )
     )
-    storage_consumer = StorageQueueConsumer(
-        name="storage-consumer",
-        queue_name=settings.SQS_STORAGE_QUEUE_NAME,
+    long_jobs_consumer = LongJobsQueueConsumer(
+        name="long-jobs-consumer",
+        queue_name=settings.SQS_LONG_JOBS_QUEUE_NAME,
         initial_delay=1,
     )
     short_jobs_consumer = ShortJobsQueueConsumer(
         name="short-jobs-consumer",
         queue_name=settings.SQS_SHORT_JOBS_QUEUE_NAME,
         initial_delay=2,
     )
-    long_jobs_consumer = LongJobsQueueConsumer(
-        name="long-jobs-consumer",
-        queue_name=settings.SQS_LONG_JOBS_QUEUE_NAME,
+    storage_consumer = StorageQueueConsumer(
+        name="storage-consumer",
+        queue_name=settings.SQS_STORAGE_QUEUE_NAME,
         initial_delay=3,
     )
-    storage_charger = PeriodicStorageCharger(initial_delay=4, name="storage-charger")
-    short_jobs_charger = PeriodicStorageCharger(initial_delay=5, name="short-jobs-charger")
-    long_jobs_charger = PeriodicStorageCharger(initial_delay=6, name="long-jobs-charger")
+    long_jobs_charger = PeriodicLongJobsCharger(name="long-jobs-charger", initial_delay=4)
+    short_jobs_charger = PeriodicShortJobsCharger(name="short-jobs-charger", initial_delay=5)
+    storage_charger = PeriodicStorageCharger(name="storage-charger", initial_delay=6)
     try:
         async with asyncio.TaskGroup() as tg:
-            tg.create_task(storage_consumer.run_forever(), name=storage_consumer.name)
-            tg.create_task(short_jobs_consumer.run_forever(), name=short_jobs_consumer.name)
             tg.create_task(long_jobs_consumer.run_forever(), name=long_jobs_consumer.name)
-            tg.create_task(storage_charger.run_forever(), name=storage_charger.name)
-            tg.create_task(short_jobs_charger.run_forever(), name=short_jobs_charger.name)
+            tg.create_task(short_jobs_consumer.run_forever(), name=short_jobs_consumer.name)
+            tg.create_task(storage_consumer.run_forever(), name=storage_consumer.name)
             tg.create_task(long_jobs_charger.run_forever(), name=long_jobs_charger.name)
+            tg.create_task(short_jobs_charger.run_forever(), name=short_jobs_charger.name)
+            tg.create_task(storage_charger.run_forever(), name=storage_charger.name)
             tg.create_task(server.serve(), name="uvicorn")
     finally:
         await database_session_manager.close()