Skip to content

Commit 98318fb

Browse files
Correct handling of RedisError exception (Fixes #919)
1 parent 268fe12 commit 98318fb

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/socketio/asyncio_redis_manager.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
import asyncio
22
import pickle
33

4-
try:
4+
try: # pragma: no cover
55
from redis import asyncio as aioredis
6-
except ImportError:
6+
from redis.exceptions import RedisError
7+
except ImportError: # pragma: no cover
78
try:
89
import aioredis
10+
from aioredis.exceptions import RedisError
911
except ImportError:
1012
aioredis = None
13+
RedisError = None
1114

1215
from .asyncio_pubsub_manager import AsyncPubSubManager
1316

@@ -63,7 +66,7 @@ async def _publish(self, data):
6366
self._redis_connect()
6467
return await self.redis.publish(
6568
self.channel, pickle.dumps(data))
66-
except aioredis.exceptions.RedisError:
69+
except RedisError:
6770
if retry:
6871
self._get_logger().error('Cannot publish to redis... '
6972
'retrying')
@@ -84,7 +87,7 @@ async def _redis_listen_with_retries(self):
8487
retry_sleep = 1
8588
async for message in self.pubsub.listen():
8689
yield message
87-
except aioredis.exceptions.RedisError:
90+
except RedisError:
8891
self._get_logger().error('Cannot receive from redis... '
8992
'retrying in '
9093
'{} secs'.format(retry_sleep))

0 commit comments

Comments
 (0)