storage uses async loggers

Author: sanderegg

services/storage/docker/boot.sh

@@ -76,7 +76,9 @@ else
 
     exec sh -c "
     cd services/storage/src/simcore_service_storage && \
-    python -Xfrozen_modules=off -m debugpy --listen 0.0.0.0:${STORAGE_REMOTE_DEBUGGING_PORT} -m uvicorn main:app \
+    python -Xfrozen_modules=off -m debugpy --listen 0.0.0.0:${STORAGE_REMOTE_DEBUGGING_PORT} -m \
+    uvicorn \
+      --factory main:app_factory \
       --host 0.0.0.0 \
       --port ${STORAGE_PORT} \
       --reload \
@@ -85,7 +87,8 @@ else
       --log-level \"${SERVER_LOG_LEVEL}\"
   "
   else
-    exec uvicorn simcore_service_storage.main:app \
+    exec uvicorn \
+      --factory simcore_service_storage.main:app_factory \
       --host 0.0.0.0 \
       --port ${STORAGE_PORT} \
       --log-level "${SERVER_LOG_LEVEL}"

services/storage/src/simcore_service_storage/core/application.py

@@ -48,8 +48,6 @@
 
 
 def create_app(settings: ApplicationSettings) -> FastAPI:  # noqa: C901
-    _logger.info("app settings: %s", settings.model_dump_json(indent=1))
-
     app = FastAPI(
         debug=settings.SC_BOOT_MODE
         in [BootModeEnum.DEBUG, BootModeEnum.DEVELOPMENT, BootModeEnum.LOCAL],

services/storage/src/simcore_service_storage/main.py

@@ -1,11 +1,16 @@
 """Main application to be deployed in for example uvicorn."""
 
+import logging
 from typing import Final
 
-from servicelib.logging_utils import setup_loggers
+from common_library.json_serialization import json_dumps
+from fastapi import FastAPI
+from servicelib.fastapi.logging_lifespan import setup_logging_shutdown_event
 from simcore_service_storage.core.application import create_app
 from simcore_service_storage.core.settings import ApplicationSettings
 
+_logger = logging.getLogger(__name__)
+
 _NOISY_LOGGERS: Final[tuple[str, ...]] = (
     "aio_pika",
     "aiobotocore",
@@ -16,14 +21,21 @@
     "werkzeug",
 )
 
-_settings = ApplicationSettings.create_from_envs()
 
-setup_loggers(
-    log_format_local_dev_enabled=_settings.STORAGE_LOG_FORMAT_LOCAL_DEV_ENABLED,
-    logger_filter_mapping=_settings.STORAGE_LOG_FILTER_MAPPING,
-    tracing_settings=_settings.STORAGE_TRACING,
-    log_base_level=_settings.log_level,
-    noisy_loggers=_NOISY_LOGGERS,
-)
+def app_factory() -> FastAPI:
+    app_settings = ApplicationSettings.create_from_envs()
+    logging_shutdown_event = setup_logging_shutdown_event(
+        log_format_local_dev_enabled=app_settings.STORAGE_LOG_FORMAT_LOCAL_DEV_ENABLED,
+        logger_filter_mapping=app_settings.STORAGE_LOG_FILTER_MAPPING,
+        tracing_settings=app_settings.STORAGE_TRACING,
+        log_base_level=app_settings.log_level,
+        noisy_loggers=_NOISY_LOGGERS,
+    )
 
-app = create_app(_settings)
+    _logger.info(
+        "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