dynamic-scheduler

Author: sanderegg

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/core/application.py

@@ -1,4 +1,5 @@
 from fastapi import FastAPI
+from servicelib.fastapi.lifespan_utils import Lifespan
 from servicelib.fastapi.monitoring import (
     initialize_prometheus_instrumentation,
 )
@@ -13,7 +14,10 @@
 from .settings import ApplicationSettings
 
 
-def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
+def create_app(
+    settings: ApplicationSettings | None = None,
+    logging_lifespan: Lifespan | None = None,
+) -> FastAPI:
     app_settings = settings or ApplicationSettings.create_from_envs()
 
     app = FastAPI(
@@ -25,7 +29,9 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
             "/doc" if app_settings.DYNAMIC_SCHEDULER_SWAGGER_API_DOC_ENABLED else None
         ),
         redoc_url=None,
-        lifespan=events.create_app_lifespan(settings=app_settings),
+        lifespan=events.create_app_lifespan(
+            settings=app_settings, logging_lifespan=logging_lifespan
+        ),
     )
     override_fastapi_openapi_method(app)
 

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/core/events.py

@@ -6,6 +6,7 @@
     create_remote_docker_client_input_state,
     remote_docker_client_lifespan,
 )
+from servicelib.fastapi.lifespan_utils import Lifespan
 from servicelib.fastapi.monitoring import (
     create_prometheus_instrumentationmain_input_state,
     prometheus_instrumentation_lifespan,
@@ -51,8 +52,12 @@ async def _settings_lifespan(app: FastAPI) -> AsyncIterator[State]:
     }
 
 
-def create_app_lifespan(settings: ApplicationSettings) -> LifespanManager:
+def create_app_lifespan(
+    settings: ApplicationSettings, logging_lifespan: Lifespan | None
+) -> LifespanManager:
     app_lifespan = LifespanManager()
+    if logging_lifespan:
+        app_lifespan.add(logging_lifespan)
     app_lifespan.add(_settings_lifespan)
 
     if settings.DYNAMIC_SCHEDULER_TRACING:

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/main.py

@@ -5,7 +5,9 @@
 
 from common_library.json_serialization import json_dumps
 from fastapi import FastAPI
-from servicelib.fastapi.logging_lifespan import setup_logging_shutdown_event
+from servicelib.fastapi.logging_lifespan import (
+    setup_logging_lifespan,
+)
 from simcore_service_dynamic_scheduler.core.application import create_app
 from simcore_service_dynamic_scheduler.core.settings import ApplicationSettings
 
@@ -22,7 +24,7 @@
 
 def app_factory() -> FastAPI:
     app_settings = ApplicationSettings.create_from_envs()
-    logging_shutdown_event = setup_logging_shutdown_event(
+    logging_lifespan = setup_logging_lifespan(
         log_format_local_dev_enabled=app_settings.DYNAMIC_SCHEDULER_LOG_FORMAT_LOCAL_DEV_ENABLED,
         logger_filter_mapping=app_settings.DYNAMIC_SCHEDULER_LOG_FILTER_MAPPING,
         tracing_settings=app_settings.DYNAMIC_SCHEDULER_TRACING,
@@ -34,6 +36,4 @@ def app_factory() -> FastAPI:
         "Application settings: %s",
         json_dumps(app_settings, indent=2, sort_keys=True),
     )
-    app = create_app(settings=app_settings)
-    app.add_event_handler("shutdown", logging_shutdown_event)
-    return app
+    return create_app(settings=app_settings, logging_lifespan=logging_lifespan)