Fixed issue with invoking _close() on closed event loop

redis · Nov 18, 2024 · ecf10fe · ecf10fe
1 parent 00f5be4
commit ecf10fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/redis/asyncio/connection.py b/redis/asyncio/connection.py
@@ -214,7 +214,13 @@ def __del__(self, _warnings: Any = warnings):
             _warnings.warn(
                 f"unclosed Connection {self!r}", ResourceWarning, source=self
             )
-            self._close()
+
+            try:
+                asyncio.get_running_loop()
+                self._close()
+            except RuntimeError:
+                # No actions been taken if pool already closed.
+                pass
 
     def _close(self):
         """

diff --git a/redis/asyncio/sentinel.py b/redis/asyncio/sentinel.py
@@ -117,7 +117,7 @@ def __init__(self, service_name, sentinel_manager, **kwargs):
         self.is_master = kwargs.pop("is_master", True)
         self.check_connection = kwargs.pop("check_connection", False)
         super().__init__(**kwargs)
-        self.connection_kwargs["connection_pool"] = weakref.proxy(self)
+        self.connection_kwargs["connection_pool"] = self
         self.service_name = service_name
         self.sentinel_manager = sentinel_manager
         self.master_address = None