align logs of aiopg and asyncpg

Author: pcrespov

packages/service-library/src/servicelib/aiohttp/db_asyncpg_engine.py

@@ -17,6 +17,7 @@
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 from ..db_asyncpg_utils import create_async_engine_and_pg_database_ready
+from ..logging_utils import log_context
 
 APP_DB_ASYNC_ENGINE_KEY: Final[str] = f"{__name__ }.AsyncEngine"
 
@@ -49,8 +50,14 @@ async def connect_to_db(app: web.Application, settings: PostgresSettings) -> Non
             update={"POSTGRES_CLIENT_NAME": settings.POSTGRES_CLIENT_NAME + "-asyncpg"}
         )
 
-    engine = await create_async_engine_and_pg_database_ready(settings)
-    _set_async_engine_to_app_state(app, engine)
+    with log_context(
+        _logger,
+        logging.INFO,
+        "Connecting app[APP_DB_ASYNC_ENGINE_KEY] to postgres with %s",
+        f"{settings=}",
+    ):
+        engine = await create_async_engine_and_pg_database_ready(settings)
+        _set_async_engine_to_app_state(app, engine)
 
     _logger.info(
         "app[APP_DB_ASYNC_ENGINE_KEY] ready : %s",
@@ -60,6 +67,8 @@ async def connect_to_db(app: web.Application, settings: PostgresSettings) -> Non
 
 async def close_db_connection(app: web.Application) -> None:
     engine = get_async_engine(app)
-    with log_context(_logger, logging.DEBUG, f"db disconnect of {engine}"):
+    with log_context(
+        _logger, logging.DEBUG, f"app[APP_DB_ASYNC_ENGINE_KEY] disconnect of {engine}"
+    ):
         if engine:
             await engine.dispose()

services/web/server/src/simcore_service_webserver/db/_aiopg.py

@@ -13,6 +13,7 @@
 from models_library.utils.json_serialization import json_dumps
 from servicelib.aiohttp.aiopg_utils import is_pg_responsive
 from servicelib.aiohttp.application_keys import APP_AIOPG_ENGINE_KEY
+from servicelib.logging_utils import log_context
 from servicelib.retry_policies import PostgresRetryPolicyUponInitialization
 from simcore_postgres_database.errors import DBAPIError
 from simcore_postgres_database.utils_aiopg import (
@@ -30,8 +31,6 @@
 
 @retry(**PostgresRetryPolicyUponInitialization(_logger).kwargs)
 async def _ensure_pg_ready(settings: PostgresSettings) -> Engine:
-
-    _logger.info("Connecting to postgres with %s", f"{settings=}")
     engine: Engine = await create_engine(
         settings.dsn,
         application_name=settings.POSTGRES_CLIENT_NAME,
@@ -45,15 +44,21 @@ async def _ensure_pg_ready(settings: PostgresSettings) -> Engine:
         await close_engine(engine)
         raise
 
-    _logger.info("Connection to postgres with %s succeeded", f"{settings=}")
     return engine  # tenacity rules guarantee exit with exc
 
 
 async def postgres_cleanup_ctx(app: web.Application) -> AsyncIterator[None]:
 
     settings = get_plugin_settings(app)
-    aiopg_engine = await _ensure_pg_ready(settings)
-    app[APP_AIOPG_ENGINE_KEY] = aiopg_engine
+
+    with log_context(
+        _logger,
+        logging.INFO,
+        "Connecting app[APP_AIOPG_ENGINE_KEY] to postgres with %s",
+        f"{settings=}",
+    ):
+        aiopg_engine = await _ensure_pg_ready(settings)
+        app[APP_AIOPG_ENGINE_KEY] = aiopg_engine
 
     _logger.info(
         "app[APP_AIOPG_ENGINE_KEY] created %s",