From aee90edfef783b11cb148f1c672effc66fb23cc4 Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Fri, 13 Oct 2023 11:57:28 +0300
Subject: [PATCH] redis-multi-exec-fix-4

---
 services/redis.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/services/redis.py b/services/redis.py
index d33b6d5..0f244c5 100644
--- a/services/redis.py
+++ b/services/redis.py
@@ -8,15 +8,19 @@ class RedisCache:
         self._uri: str = uri
         self.pubsub_channels = []
         self._redis = None
+        self._pubsub = None
 
     async def connect(self):
         self._redis = aredis.StrictRedis.from_url(self._uri, decode_responses=True)
+        await self._redis.connection_pool.connect()
+        self._pubsub = self._redis.pubsub()
         response = await self.execute('PING')
         print(f"[redis] PING response: {response}")
 
     async def disconnect(self):
         self._redis.connection_pool.disconnect()
         self._redis = None
+        self._pubsub = None
 
     async def execute(self, command, *args, **kwargs):
         while not self._redis:
@@ -26,20 +30,20 @@ class RedisCache:
             return await self._redis.execute_command(command, *args, **kwargs)
         except Exception as e:
             print(f"[redis] error: {e}")
-            return None
+            raise
 
     async def subscribe(self, *channels):
         if not self._redis:
             await self.connect()
         for channel in channels:
-            await self._redis.subscribe(channel)
+            await self._pubsub.subscribe(channel)
             self.pubsub_channels.append(channel)
 
     async def unsubscribe(self, *channels):
         if not self._redis:
             return
         for channel in channels:
-            await self._redis.unsubscribe(channel)
+            await self._pubsub.unsubscribe(channel)
             self.pubsub_channels.remove(channel)
 
     async def publish(self, channel, data):
@@ -55,8 +59,6 @@ class RedisCache:
         print(f"[redis] MGET {key} {keys}")
         return await self._redis.mget(key, *keys)
 
-
-
 redis = RedisCache()
 
 __all__ = ["redis"]