notifications

Author: sanderegg

services/notifications/src/simcore_service_notifications/core/application.py

@@ -1,6 +1,7 @@
 import logging
 
 from fastapi import FastAPI
+from servicelib.fastapi.lifespan_utils import Lifespan
 from servicelib.fastapi.monitoring import (
     initialize_prometheus_instrumentation,
 )
@@ -12,7 +13,6 @@
     initialize_fastapi_app_tracing,
     setup_tracing,
 )
-from servicelib.logging_utils import setup_loggers
 
 from .._meta import API_VTAG, APP_NAME, SUMMARY, VERSION
 from ..api.rest.routing import initialize_rest_api
@@ -22,21 +22,11 @@
 _logger = logging.getLogger(__name__)
 
 
-def _initialise_logger(settings: ApplicationSettings):
-    setup_loggers(
-        log_format_local_dev_enabled=settings.NOTIFICATIONS_VOLUMES_LOG_FORMAT_LOCAL_DEV_ENABLED,
-        logger_filter_mapping=settings.NOTIFICATIONS_VOLUMES_LOG_FILTER_MAPPING,
-        tracing_settings=settings.NOTIFICATIONS_TRACING,
-        log_base_level=settings.log_level,
-        noisy_loggers=None,
-    )
-
-
-def create_app() -> FastAPI:
-    settings = ApplicationSettings.create_from_envs()
-    _logger.debug(settings.model_dump_json(indent=2))
-
-    _initialise_logger(settings)
+def create_app(
+    settings: ApplicationSettings | None = None,
+    logging_lifespan: Lifespan | None = None,
+) -> FastAPI:
+    settings = settings or ApplicationSettings.create_from_envs()
 
     assert settings.SC_BOOT_MODE  # nosec
     app = FastAPI(
@@ -45,7 +35,7 @@ def create_app() -> FastAPI:
         description=SUMMARY,
         version=f"{VERSION}",
         openapi_url=f"/api/{API_VTAG}/openapi.json",
-        lifespan=events.create_app_lifespan(),
+        lifespan=events.create_app_lifespan(logging_lifespan=logging_lifespan),
         **get_common_oas_options(is_devel_mode=settings.SC_BOOT_MODE.is_devel_mode()),
     )
     override_fastapi_openapi_method(app)

services/notifications/src/simcore_service_notifications/core/events.py

@@ -2,6 +2,7 @@
 
 from fastapi import FastAPI
 from fastapi_lifespan_manager import LifespanManager, State
+from servicelib.fastapi.lifespan_utils import Lifespan
 from servicelib.fastapi.monitoring import (
     create_prometheus_instrumentationmain_input_state,
     prometheus_instrumentation_lifespan,
@@ -35,9 +36,13 @@ async def _settings_lifespan(app: FastAPI) -> AsyncIterator[State]:
     }
 
 
-def create_app_lifespan():
+def create_app_lifespan(
+    logging_lifespan: Lifespan | None = None,
+) -> LifespanManager[FastAPI]:
     # WARNING: order matters
     app_lifespan = LifespanManager()
+    if logging_lifespan:
+        app_lifespan.add(logging_lifespan)
     app_lifespan.add(_settings_lifespan)
 
     # - postgres

services/notifications/src/simcore_service_notifications/main.py

@@ -1,3 +1,34 @@
+import logging
+from typing import Final
+
+from common_library.json_serialization import json_dumps
+from fastapi import FastAPI
+from servicelib.fastapi.logging_lifespan import setup_logging_lifespan
 from simcore_service_notifications.core.application import create_app
+from simcore_service_notifications.core.settings import (
+    ApplicationSettings,
+)
+
+_logger = logging.getLogger(__name__)
+
+_NOISY_LOGGERS: Final[tuple[str, ...]] = (
+    "aio_pika",
+    "aiormq",
+)
+
+
+def app_factory() -> FastAPI:
+    app_settings = ApplicationSettings.create_from_envs()
+    logging_lifespan = setup_logging_lifespan(
+        log_format_local_dev_enabled=app_settings.NOTIFICATIONS_VOLUMES_LOG_FORMAT_LOCAL_DEV_ENABLED,
+        logger_filter_mapping=app_settings.NOTIFICATIONS_VOLUMES_LOG_FILTER_MAPPING,
+        tracing_settings=app_settings.NOTIFICATIONS_TRACING,
+        log_base_level=app_settings.log_level,
+        noisy_loggers=_NOISY_LOGGERS,
+    )
 
-the_app = create_app()
+    _logger.info(
+        "Application settings: %s",
+        json_dumps(app_settings, indent=2, sort_keys=True),
+    )
+    return create_app(settings=app_settings, logging_lifespan=logging_lifespan)