From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Fri, 6 Oct 2023 15:04:42 +0000 (+0200)
Subject: refactor(pool): don't use a no-op function as reconnect callback
X-Git-Tag: pool-3.1.9~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ee897eef3217392682a04fdc8acabd1a6a991b9;p=thirdparty%2Fpsycopg.git

refactor(pool): don't use a no-op function as reconnect callback

Just check for None.
---

diff --git a/psycopg_pool/psycopg_pool/base.py b/psycopg_pool/psycopg_pool/base.py
index fe29408c3..f54af8108 100644
--- a/psycopg_pool/psycopg_pool/base.py
+++ b/psycopg_pool/psycopg_pool/base.py
@@ -64,8 +64,7 @@ class BasePool(Generic[ConnectionType]):
 
         self.conninfo = conninfo
         self.kwargs: Dict[str, Any] = kwargs or {}
-        self._reconnect_failed: Callable[["BasePool[ConnectionType]"], None]
-        self._reconnect_failed = reconnect_failed or (lambda pool: None)
+        self._reconnect_failed = reconnect_failed
         self.name = name
         self._min_size = min_size
         self._max_size = max_size
diff --git a/psycopg_pool/psycopg_pool/pool.py b/psycopg_pool/psycopg_pool/pool.py
index 9c3c7dc3c..8254c5934 100644
--- a/psycopg_pool/psycopg_pool/pool.py
+++ b/psycopg_pool/psycopg_pool/pool.py
@@ -458,6 +458,9 @@ class ConnectionPool(BasePool[Connection[Any]]):
         """
         Called when reconnection failed for longer than `reconnect_timeout`.
         """
+        if not self._reconnect_failed:
+            return
+
         self._reconnect_failed(self)
 
     def run_task(self, task: "MaintenanceTask") -> None:
diff --git a/psycopg_pool/psycopg_pool/pool_async.py b/psycopg_pool/psycopg_pool/pool_async.py
index 8d9184620..fa310b129 100644
--- a/psycopg_pool/psycopg_pool/pool_async.py
+++ b/psycopg_pool/psycopg_pool/pool_async.py
@@ -396,6 +396,9 @@ class AsyncConnectionPool(BasePool[AsyncConnection[Any]]):
         """
         Called when reconnection failed for longer than `reconnect_timeout`.
         """
+        if not self._reconnect_failed:
+            return
+
         self._reconnect_failed(self)
 
     def run_task(self, task: "MaintenanceTask") -> None: