re
/
redis
forked from mirror/redis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1043 from ramonberrutti/sentinel_password 

add option for sentinel password
This commit is contained in:
Vladimir Mihailenco 2019-06-04 13:57:50 +03:00 committed by GitHub
parent c41450a08f c6e879efe2
commit 9dba04507e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sentinel.go
View File

@ -28,8 +28,9 @@ type FailoverOptions struct {
Dialer func(network, addr string) (net.Conn, error) Dialer func(network, addr string) (net.Conn, error)
OnConnect func(*Conn) error OnConnect func(*Conn) error
Password string Password string
DB int SentinelPassword string
DB int
MaxRetries int MaxRetries int
MinRetryBackoff time.Duration MinRetryBackoff time.Duration
@ -83,6 +84,7 @@ func NewFailoverClient(failoverOpt *FailoverOptions) *Client {
failover := &sentinelFailover{ failover := &sentinelFailover{
masterName: failoverOpt.MasterName, masterName: failoverOpt.MasterName,
sentinelAddrs: failoverOpt.SentinelAddrs, sentinelAddrs: failoverOpt.SentinelAddrs,
password: failoverOpt.SentinelPassword,
opt: opt, opt: opt,
} }
@ -280,7 +282,8 @@ func (c *SentinelClient) Remove(name string) *StringCmd {
type sentinelFailover struct { type sentinelFailover struct {
sentinelAddrs []string sentinelAddrs []string
opt *Options opt *Options
password string
pool *pool.ConnPool pool *pool.ConnPool
poolOnce sync.Once poolOnce sync.Once
@ -339,6 +342,8 @@ func (c *sentinelFailover) masterAddr() (string, error) {
sentinel := NewSentinelClient(&Options{ sentinel := NewSentinelClient(&Options{
Addr: sentinelAddr, Addr: sentinelAddr,
Password: c.password,
MaxRetries: c.opt.MaxRetries, MaxRetries: c.opt.MaxRetries,
DialTimeout: c.opt.DialTimeout, DialTimeout: c.opt.DialTimeout,