Merge pull request #1580 from darkyzhou/patch-1

vmihailenco · web-flow · commit 80d296154f6a · 2020-12-16T10:17:18.000+02:00
make error message for unreachable sentinels more clear
diff --git a/sentinel.go b/sentinel.go
@@ -485,7 +485,7 @@ func (c *sentinelFailover) MasterAddr(ctx context.Context) (string, error) {
 		return addr, nil
 	}
 
-	return "", errors.New("redis: all sentinels are unreachable")
+	return "", errors.New("redis: all sentinels specified in configuration are unreachable")
 }
 
 func (c *sentinelFailover) slaveAddrs(ctx context.Context) ([]string, error) {
@@ -530,7 +530,7 @@ func (c *sentinelFailover) slaveAddrs(ctx context.Context) ([]string, error) {
 		return addrs, nil
 	}
 
-	return []string{}, errors.New("redis: all sentinels are unreachable")
+	return []string{}, errors.New("redis: all sentinels specified in configuration are unreachable")
 }
 
 func (c *sentinelFailover) getMasterAddr(ctx context.Context, sentinel *SentinelClient) string {

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ func (c *sentinelFailover) MasterAddr(ctx context.Context) (string, error) {`
`485`	`485`	`return addr, nil`
`486`	`486`	`}`
`487`	`487`
`488`		`- return "", errors.New("redis: all sentinels are unreachable")`
	`488`	`+ return "", errors.New("redis: all sentinels specified in configuration are unreachable")`
`489`	`489`	`}`
`490`	`490`
`491`	`491`	`func (c *sentinelFailover) slaveAddrs(ctx context.Context) ([]string, error) {`
`@@ -530,7 +530,7 @@ func (c *sentinelFailover) slaveAddrs(ctx context.Context) ([]string, error) {`
`530`	`530`	`return addrs, nil`
`531`	`531`	`}`
`532`	`532`
`533`		`- return []string{}, errors.New("redis: all sentinels are unreachable")`
	`533`	`+ return []string{}, errors.New("redis: all sentinels specified in configuration are unreachable")`
`534`	`534`	`}`
`535`	`535`
`536`	`536`	`func (c sentinelFailover) getMasterAddr(ctx context.Context, sentinel SentinelClient) string {`