]> git.ipfire.org Git - thirdparty/psycopg.git/commitdiff
Use public logger names (to be documented)
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>
Mon, 12 Apr 2021 12:28:54 +0000 (13:28 +0100)
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>
Mon, 12 Apr 2021 12:31:37 +0000 (13:31 +0100)
Use "psycopg3" and "psycopg3.pool" as loggers which can be addressed.

Also cleanup of random inconsistencies around logging.

psycopg3/psycopg3/connection.py
psycopg3/psycopg3/pool/async_pool.py
psycopg3/psycopg3/pool/base.py
psycopg3/psycopg3/pool/pool.py
psycopg3/psycopg3/pool/sched.py
psycopg3/psycopg3/transaction.py

index 3a51c605a63fe2d51219a5bd9f0ea34f49db3587..51e7c1720eb6da6363c43f0e2923f438d3a82141 100644 (file)
@@ -33,8 +33,7 @@ from .transaction import Transaction, AsyncTransaction
 from .utils.compat import asynccontextmanager
 from .server_cursor import ServerCursor, AsyncServerCursor
 
-logger = logging.getLogger(__name__)
-package_logger = logging.getLogger("psycopg3")
+logger = logging.getLogger("psycopg3")
 
 connect: Callable[[str], PQGenConn["PGconn"]]
 execute: Callable[["PGconn"], PQGen[List["PGresult"]]]
@@ -264,7 +263,7 @@ class BaseConnection(AdaptContext):
             try:
                 cb(diag)
             except Exception as ex:
-                package_logger.exception(
+                logger.exception(
                     "error processing notice callback '%s': %s", cb, ex
                 )
 
index 3d8d2799809b10af11cc34a9cfe95d853445318d..0c4d38217a2bce854e86b51152d446ab890dcdc0 100644 (file)
@@ -24,7 +24,7 @@ from .base import ConnectionAttempt, BasePool
 from .sched import AsyncScheduler
 from .errors import PoolClosed, PoolTimeout, TooManyRequests
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("psycopg3.pool")
 
 
 class AsyncConnectionPool(BasePool[AsyncConnection]):
index d8b25758e15df4343e7af23383a9e651d7b6fcd2..dce0c1204865794dd5b1ebdd04dbbaf39d07233e 100644 (file)
@@ -4,7 +4,6 @@ psycopg3 connection pool base class and functionalities.
 
 # Copyright (C) 2021 The Psycopg Team
 
-import logging
 from random import random
 from typing import Any, Callable, Deque, Dict, Generic, Optional
 from typing import TYPE_CHECKING
@@ -16,9 +15,6 @@ if TYPE_CHECKING:
     from typing import Counter as TCounter
 
 
-logger = logging.getLogger(__name__)
-
-
 class BasePool(Generic[ConnectionType]):
 
     # Used to generate pool names
index 1b39c4f805154fced2e4868462fd775e4cc2ed88..c75b8edab8d405938e2ba8823f1d6c934a9107df 100644 (file)
@@ -23,7 +23,7 @@ from .base import ConnectionAttempt, BasePool
 from .sched import Scheduler
 from .errors import PoolClosed, PoolTimeout, TooManyRequests
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("psycopg3.pool")
 
 
 class ConnectionPool(BasePool[Connection]):
index 95af07532c4ac41cf16ac45d01c5a5aa16fe3250..6c5b4bea52baf4c6d843330a429a38259dcfe18b 100644 (file)
@@ -164,7 +164,6 @@ class AsyncScheduler:
                 self._event.clear()
 
             if task:
-                # logger.info("task %s action %s", task, task.action)
                 if not task.action:
                     break
                 try:
index 650a4f1ef38bcd72ca4eea914e32257699a6214b..cdc2b7b65e2344c5fe350a06f5456c4c97c6fcf2 100644 (file)
@@ -18,7 +18,7 @@ from .pq.proto import PGresult
 if TYPE_CHECKING:
     from .connection import Connection, AsyncConnection  # noqa: F401
 
-_log = logging.getLogger(__name__)
+logger = logging.getLogger(__name__)
 
 
 class Rollback(Exception):
@@ -148,7 +148,7 @@ class BaseTransaction(Generic[ConnectionType]):
 
     def _rollback_gen(self, exc_val: Optional[BaseException]) -> PQGen[bool]:
         if isinstance(exc_val, Rollback):
-            _log.debug(
+            logger.debug(
                 f"{self._conn}: Explicit rollback from: ", exc_info=True
             )