Merge pull request redis#890 from go-redis/fix/close-nil-sentinel

Fix closing nil sentinel
nextgeniuspro · Oct 25, 2018 · b3d9bf1 · b3d9bf1
2 parents fa76dd0 + 171a6d1
commit b3d9bf1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/sentinel.go b/sentinel.go
@@ -181,7 +181,10 @@ type sentinelFailover struct {
 func (c *sentinelFailover) Close() error {
 	c.mu.Lock()
 	defer c.mu.Unlock()
-	return c.closeSentinel()
+	if c.sentinel != nil {
+		return c.closeSentinel()
+	}
+	return nil
 }
 
 func (c *sentinelFailover) Pool() *pool.ConnPool {
@@ -240,7 +243,7 @@ func (c *sentinelFailover) masterAddr() (string, error) {
 		if err != nil {
 			internal.Logf("sentinel: GetMasterAddrByName master=%q failed: %s",
 				c.masterName, err)
-			sentinel.Close()
+			_ = sentinel.Close()
 			continue
 		}