From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Mon, 12 Apr 2021 12:28:54 +0000 (+0100)
Subject: Use public logger names (to be documented)
X-Git-Tag: 3.0.dev0~75^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=817c6825e2c5bdb9c668ee9afb676b0a116bb474;p=thirdparty%2Fpsycopg.git

Use public logger names (to be documented)

Use "psycopg3" and "psycopg3.pool" as loggers which can be addressed.

Also cleanup of random inconsistencies around logging.
---

diff --git a/psycopg3/psycopg3/connection.py b/psycopg3/psycopg3/connection.py
index 3a51c605a..51e7c1720 100644
--- a/psycopg3/psycopg3/connection.py
+++ b/psycopg3/psycopg3/connection.py
@@ -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
                 )
 
diff --git a/psycopg3/psycopg3/pool/async_pool.py b/psycopg3/psycopg3/pool/async_pool.py
index 3d8d27998..0c4d38217 100644
--- a/psycopg3/psycopg3/pool/async_pool.py
+++ b/psycopg3/psycopg3/pool/async_pool.py
@@ -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]):
diff --git a/psycopg3/psycopg3/pool/base.py b/psycopg3/psycopg3/pool/base.py
index d8b25758e..dce0c1204 100644
--- a/psycopg3/psycopg3/pool/base.py
+++ b/psycopg3/psycopg3/pool/base.py
@@ -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
diff --git a/psycopg3/psycopg3/pool/pool.py b/psycopg3/psycopg3/pool/pool.py
index 1b39c4f80..c75b8edab 100644
--- a/psycopg3/psycopg3/pool/pool.py
+++ b/psycopg3/psycopg3/pool/pool.py
@@ -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]):
diff --git a/psycopg3/psycopg3/pool/sched.py b/psycopg3/psycopg3/pool/sched.py
index 95af07532..6c5b4bea5 100644
--- a/psycopg3/psycopg3/pool/sched.py
+++ b/psycopg3/psycopg3/pool/sched.py
@@ -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:
diff --git a/psycopg3/psycopg3/transaction.py b/psycopg3/psycopg3/transaction.py
index 650a4f1ef..cdc2b7b65 100644
--- a/psycopg3/psycopg3/transaction.py
+++ b/psycopg3/psycopg3/transaction.py
@@ -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
             )