improves logs

Author: pcrespov

packages/service-library/src/servicelib/db_asyncpg_utils.py

@@ -3,7 +3,6 @@
 from datetime import timedelta
 
 from models_library.healthchecks import IsNonResponsive, IsResponsive, LivenessResult
-from servicelib.logging_utils import log_context
 from settings_library.postgres import PostgresSettings
 from simcore_postgres_database.utils_aiosqlalchemy import (  # type: ignore[import-not-found] # this on is unclear
     raise_if_migration_not_ready,
@@ -12,7 +11,6 @@
 from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
 from tenacity import retry
 
-from .logging_utils import log_context
 from .retry_policies import PostgresRetryPolicyUponInitialization
 
 _logger = logging.getLogger(__name__)
@@ -28,29 +26,23 @@ async def create_async_engine_and_pg_database_ready(
     - waits until db data is migrated (i.e. ready to use)
     - returns engine
     """
-    with log_context(
-        _logger, logging.DEBUG, f"Connecting to {settings.dsn_with_async_sqlalchemy}"
-    ):
-        engine: AsyncEngine = create_async_engine(
-            settings.dsn_with_async_sqlalchemy,
-            pool_size=settings.POSTGRES_MINSIZE,
-            max_overflow=settings.POSTGRES_MAXSIZE - settings.POSTGRES_MINSIZE,
-            connect_args={
-                "server_settings": {"application_name": settings.POSTGRES_CLIENT_NAME}
-            },
-            pool_pre_ping=True,  # https://docs.sqlalchemy.org/en/14/core/pooling.html#dealing-with-disconnects
-            future=True,  # this uses sqlalchemy 2.0 API, shall be removed when sqlalchemy 2.0 is released
-        )
+    engine: AsyncEngine = create_async_engine(
+        settings.dsn_with_async_sqlalchemy,
+        pool_size=settings.POSTGRES_MINSIZE,
+        max_overflow=settings.POSTGRES_MAXSIZE - settings.POSTGRES_MINSIZE,
+        connect_args={
+            "server_settings": {"application_name": settings.POSTGRES_CLIENT_NAME}
+        },
+        pool_pre_ping=True,  # https://docs.sqlalchemy.org/en/14/core/pooling.html#dealing-with-disconnects
+        future=True,  # this uses sqlalchemy 2.0 API, shall be removed when sqlalchemy 2.0 is released
+    )
 
-    with log_context(
-        _logger, logging.DEBUG, f"Migrating db {settings.dsn_with_async_sqlalchemy}"
-    ):
-        try:
-            await raise_if_migration_not_ready(engine)
-        except Exception:
-            # NOTE: engine must be closed because retry will create a new engine
-            await engine.dispose()
-            raise
+    try:
+        await raise_if_migration_not_ready(engine)
+    except Exception:
+        # NOTE: engine must be closed because retry will create a new engine
+        await engine.dispose()
+        raise
 
     return engine
 

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

@@ -13,7 +13,13 @@
 
 
 async def connect_to_db(app: FastAPI, settings: PostgresSettings) -> None:
-    engine = await create_async_engine_and_pg_database_ready(settings)
+    with log_context(
+        _logger,
+        logging.DEBUG,
+        f"Connecting and migraging {settings.dsn_with_async_sqlalchemy}",
+    ):
+        engine = await create_async_engine_and_pg_database_ready(settings)
+
     app.state.engine = engine
     _logger.debug(
         "Setup engine: %s",