better integration

Author: sanderegg

services/web/server/src/simcore_service_webserver/cli.py

@@ -13,6 +13,7 @@
 
 """
 
+from contextlib import AsyncExitStack
 import logging
 import os
 from typing import Annotated, Final
@@ -22,6 +23,8 @@
 from common_library.json_serialization import json_dumps
 from settings_library.utils_cli import create_settings_command
 
+from servicelib.logging_utils import setup_async_loggers
+
 from .application_settings import ApplicationSettings
 from .login import cli as login_cli
 
@@ -80,12 +83,26 @@ async def app_factory() -> web.Application:
         tracing_settings=app_settings.WEBSERVER_TRACING,
     )
 
-    if app_settings.WEBSERVER_APP_FACTORY_NAME == "WEBSERVER_AUTHZ_APP_FACTORY":
+    exit_stack = AsyncExitStack()
+    await exit_stack.enter_async_context(
+        setup_async_loggers(
+            log_format_local_dev_enabled=app_settings.WEBSERVER_LOG_FORMAT_LOCAL_DEV_ENABLED,
+            logger_filter_mapping=app_settings.WEBSERVER_LOG_FILTER_MAPPING,
+            tracing_settings=app_settings.WEBSERVER_TRACING,
+        )
+    )
 
+    if app_settings.WEBSERVER_APP_FACTORY_NAME == "WEBSERVER_AUTHZ_APP_FACTORY":
         app = create_application_auth()
     else:
         app, _ = _setup_app_from_settings(app_settings)
 
+    async def _cleanup_event(app: web.Application) -> None:
+        assert app  # nosec
+        _logger.info("Cleaning up application resources")
+        await exit_stack.aclose()
+
+    app.on_cleanup.append(_cleanup_event)
     return app
 
 

services/web/server/src/simcore_service_webserver/log.py

@@ -1,12 +1,17 @@
 """Configuration and utilities for service logging"""
 
 import logging
+from collections.abc import AsyncGenerator
 
 from aiodebug import log_slow_callbacks  # type: ignore[import-untyped]
+from aiohttp import web
 from aiohttp.log import access_logger
-from servicelib.logging_utils import config_all_loggers
+from servicelib.aiohttp.application_setup import ensure_single_setup
+from servicelib.logging_utils import setup_async_loggers
 from settings_library.tracing import TracingSettings
 
+from simcore_service_webserver.application_settings import get_application_settings
+
 LOG_LEVEL_STEP = logging.CRITICAL - logging.ERROR
 NOISY_LOGGERS = (
     "aio_pika",
@@ -36,11 +41,11 @@ def setup_logging(
 
     # root
     logging.root.setLevel(level)
-    config_all_loggers(
-        log_format_local_dev_enabled=log_format_local_dev_enabled,
-        logger_filter_mapping=logger_filter_mapping,
-        tracing_settings=tracing_settings,
-    )
+    # config_all_loggers(
+    #     log_format_local_dev_enabled=log_format_local_dev_enabled,
+    #     logger_filter_mapping=logger_filter_mapping,
+    #     tracing_settings=tracing_settings,
+    # )
 
     # Enforces same log-level to aiohttp & gunicorn access loggers
     #