summaryrefslogtreecommitdiff
path: root/redis
diff options
context:
space:
mode:
authorEugene Morozov <jmv@emorozov.net>2021-11-08 09:59:14 +0300
committerGitHub <noreply@github.com>2021-11-08 08:59:14 +0200
commitbba75187931af84dd21c91bcf1b3bd422c9aed72 (patch)
tree59c256b4929623e62f90038b35687b8239bbabf8 /redis
parent4257ceb1e5b438d9e7ea4d2ac0c74609c2771749 (diff)
downloadredis-py-bba75187931af84dd21c91bcf1b3bd422c9aed72.tar.gz
Fix garbage collection deadlock (#1578)
Diffstat (limited to 'redis')
-rwxr-xr-xredis/connection.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/redis/connection.py b/redis/connection.py
index f5d6a38..cb9acb4 100755
--- a/redis/connection.py
+++ b/redis/connection.py
@@ -10,6 +10,7 @@ import os
import socket
import threading
import warnings
+import weakref
from redis.exceptions import (
AuthenticationError,
@@ -562,7 +563,7 @@ class Connection:
pass
def register_connect_callback(self, callback):
- self._connect_callbacks.append(callback)
+ self._connect_callbacks.append(weakref.WeakMethod(callback))
def clear_connect_callbacks(self):
self._connect_callbacks = []
@@ -588,8 +589,10 @@ class Connection:
# run any user callbacks. right now the only internal callback
# is for pubsub channel/pattern resubscription
- for callback in self._connect_callbacks:
- callback(self)
+ for ref in self._connect_callbacks:
+ callback = ref()
+ if callback:
+ callback(self)
def _connect(self):
"Create a TCP socket connection"