From b260019bb73a46607bbdd9ae7347b7759c2a3d48 Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Wed, 2 Sep 2015 16:27:25 -0700 Subject: [PATCH 1/2] Try the next sentinel host on socket timeout --- redis/sentinel.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/redis/sentinel.py b/redis/sentinel.py index 2f30062cd2..34eeaeeef0 100644 --- a/redis/sentinel.py +++ b/redis/sentinel.py @@ -4,7 +4,7 @@ from redis.client import StrictRedis from redis.connection import ConnectionPool, Connection -from redis.exceptions import ConnectionError, ResponseError, ReadOnlyError +from redis.exceptions import ConnectionError, ResponseError, ReadOnlyError, TimeoutError from redis._compat import iteritems, nativestr, xrange @@ -209,7 +209,7 @@ def discover_master(self, service_name): for sentinel_no, sentinel in enumerate(self.sentinels): try: masters = sentinel.sentinel_masters() - except ConnectionError: + except (ConnectionError, TimeoutError): continue state = masters.get(service_name) if state and self.check_master_state(state, service_name): @@ -233,7 +233,7 @@ def discover_slaves(self, service_name): for sentinel in self.sentinels: try: slaves = sentinel.sentinel_slaves(service_name) - except (ConnectionError, ResponseError): + except (ConnectionError, ResponseError, TimeoutError): continue slaves = self.filter_slaves(slaves) if slaves: From 68d97aa26992836bb6324709f40d0bb801da7630 Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Wed, 2 Sep 2015 16:36:57 -0700 Subject: [PATCH 2/2] Wrap import line to < 79 characters --- redis/sentinel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/redis/sentinel.py b/redis/sentinel.py index 34eeaeeef0..a5562b34b4 100644 --- a/redis/sentinel.py +++ b/redis/sentinel.py @@ -4,7 +4,8 @@ from redis.client import StrictRedis from redis.connection import ConnectionPool, Connection -from redis.exceptions import ConnectionError, ResponseError, ReadOnlyError, TimeoutError +from redis.exceptions import (ConnectionError, ResponseError, ReadOnlyError, + TimeoutError) from redis._compat import iteritems, nativestr, xrange