datcore-adapter

Author: sanderegg

services/datcore-adapter/src/simcore_service_datcore_adapter/core/application.py

@@ -31,8 +31,6 @@
 
 
 def create_app(settings: ApplicationSettings) -> FastAPI:
-    _logger.debug("App settings:\n%s", settings.model_dump_json(indent=1))
-
     app = FastAPI(
         debug=settings.SC_BOOT_MODE
         in [BootModeEnum.DEBUG, BootModeEnum.DEVELOPMENT, BootModeEnum.LOCAL],

services/datcore-adapter/src/simcore_service_datcore_adapter/main.py

@@ -1,27 +1,37 @@
 """Main application to be deployed in for example uvicorn"""
 
+import logging
 from typing import Final
 
+from common_library.json_serialization import json_dumps
 from fastapi import FastAPI
-from servicelib.logging_utils import setup_loggers
+from servicelib.fastapi.logging_lifespan import setup_logging_shutdown_event
 from simcore_service_datcore_adapter.core.application import create_app
 from simcore_service_datcore_adapter.core.settings import ApplicationSettings
 
-NOISY_LOGGERS: Final[tuple[str, ...]] = (
+_logger = logging.getLogger(__name__)
+
+_NOISY_LOGGERS: Final[tuple[str, ...]] = (
     "aiocache",
     "botocore",
     "hpack",
 )
 
-_the_settings = ApplicationSettings.create_from_envs()
 
-setup_loggers(
-    log_format_local_dev_enabled=_the_settings.DATCORE_ADAPTER_LOG_FORMAT_LOCAL_DEV_ENABLED,
-    logger_filter_mapping=_the_settings.DATCORE_ADAPTER_LOG_FILTER_MAPPING,
-    tracing_settings=_the_settings.DATCORE_ADAPTER_TRACING,
-    log_base_level=_the_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.DATCORE_ADAPTER_LOG_FORMAT_LOCAL_DEV_ENABLED,
+        logger_filter_mapping=app_settings.DATCORE_ADAPTER_LOG_FILTER_MAPPING,
+        tracing_settings=app_settings.DATCORE_ADAPTER_TRACING,
+        log_base_level=app_settings.log_level,
+        noisy_loggers=_NOISY_LOGGERS,
+    )
 
-# SINGLETON FastAPI app
-the_app: FastAPI = create_app(_the_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