update testOnBorrow

centrifugal · Mar 10, 2016 · 86169e9 · 86169e9
1 parent 20da63c
commit 86169e9
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/libcentrifugo/engineredis.go b/libcentrifugo/engineredis.go
@@ -248,10 +248,15 @@ func newPool(conf *RedisEngineConfig) *redis.Pool {
 			return c, err
 		},
 		TestOnBorrow: func(c redis.Conn, t time.Time) error {
-			if !sentinel.TestRole(c, "master") {
-				return errors.New("Failed role check")
+			if useSentinel {
+				if !sentinel.TestRole(c, "master") {
+					return errors.New("Failed master role check")
+				} else {
+					return nil
+				}
 			} else {
-				return nil
+				_, err := c.Do("PING")
+				return err
 			}
 		},
 	}