fix redis client

2021-08-16 15:09:04 +03:00
parent fbb8a0e93d
commit 9618802c6b
1 changed files with 49 additions and 50 deletions
--- a/redis/client.py
+++ b/redis/client.py
@@ -1,50 +1,49 @@
-from typing import Optional
-
-import aioredis
-# from aioredis import ConnectionsPool
-
-from settings import REDIS_URL
-
-
-class Redis:
-    def __init__(self, uri=REDIS_URL):
-        self._uri: str = uri
-        self._instance = None
-
-    async def connect(self):
-        if self._instance is not None:
-            return
-        self._instance = await aioredis.from_url(self._uri)# .create_pool(self._uri)
-
-    async def disconnect(self):
-        if self._instance is None:
-            return
-        self._instance.close()
-        await self._instance.wait_closed()
-        self._instance = None
-
-    async def execute(self, command, *args, **kwargs):
-        return await self._instance.execute(command, *args, **kwargs, encoding="UTF-8")
-
-
-async def test():
-    redis = Redis()
-    from datetime import datetime
-
-    await redis.connect()
-    await redis.execute("SET", "1-KEY1", 1)
-    await redis.execute("SET", "1-KEY2", 1)
-    await redis.execute("SET", "1-KEY3", 1)
-    await redis.execute("SET", "1-KEY4", 1)
-    await redis.execute("EXPIREAT", "1-KEY4", int(datetime.utcnow().timestamp()))
-    v = await redis.execute("KEYS", "1-*")
-    print(v)
-    await redis.execute("DEL", *v)
-    v = await redis.execute("KEYS", "1-*")
-    print(v)
-
-
-if __name__ == '__main__':
-    import asyncio
-
-    asyncio.run(test())
+from typing import Optional
+
+import aioredis
+
+from settings import REDIS_URL
+
+
+class Redis:
+    def __init__(self, uri=REDIS_URL):
+        self._uri: str = uri
+        self._instance = None
+
+    async def connect(self):
+        if self._instance is not None:
+            return
+        self._instance = aioredis.from_url(self._uri, encoding="utf-8")
+
+    async def disconnect(self):
+        if self._instance is None:
+            return
+        self._instance.close()
+        await self._instance.wait_closed()
+        self._instance = None
+
+    async def execute(self, command, *args, **kwargs):
+        return await self._instance.execute_command(command, *args, **kwargs)
+
+
+async def test():
+    redis = Redis()
+    from datetime import datetime
+
+    await redis.connect()
+    await redis.execute("SET", "1-KEY1", 1)
+    await redis.execute("SET", "1-KEY2", 1)
+    await redis.execute("SET", "1-KEY3", 1)
+    await redis.execute("SET", "1-KEY4", 1)
+    await redis.execute("EXPIREAT", "1-KEY4", int(datetime.utcnow().timestamp()))
+    v = await redis.execute("KEYS", "1-*")
+    print(v)
+    await redis.execute("DEL", *v)
+    v = await redis.execute("KEYS", "1-*")
+    print(v)
+
+
+if __name__ == '__main__':
+    import asyncio
+
+    asyncio.run(test())