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

Merge pull request #882 from go-redis/fix/sentinel-options 

Copy TLSConfig to SentinelClient options
This commit is contained in:
Vladimir Mihailenco 2018-10-10 12:04:06 +03:00 committed by GitHub
parent daf101bd79 9b063e2e30
commit 55f1f4681d
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

5
sentinel.go
View File

@ -222,6 +222,8 @@ func (c *sentinelFailover) masterAddr() (string, error) {
sentinel := NewSentinelClient(&Options{ sentinel := NewSentinelClient(&Options{
Addr: sentinelAddr, Addr: sentinelAddr,
MaxRetries: c.opt.MaxRetries,
DialTimeout: c.opt.DialTimeout, DialTimeout: c.opt.DialTimeout,
ReadTimeout: c.opt.ReadTimeout, ReadTimeout: c.opt.ReadTimeout,
WriteTimeout: c.opt.WriteTimeout, WriteTimeout: c.opt.WriteTimeout,
@ -229,6 +231,9 @@ func (c *sentinelFailover) masterAddr() (string, error) {
PoolSize: c.opt.PoolSize, PoolSize: c.opt.PoolSize,
PoolTimeout: c.opt.PoolTimeout, PoolTimeout: c.opt.PoolTimeout,
IdleTimeout: c.opt.IdleTimeout, IdleTimeout: c.opt.IdleTimeout,
IdleCheckFrequency: c.opt.IdleCheckFrequency,
TLSConfig: c.opt.TLSConfig,
}) })
masterAddr, err := sentinel.GetMasterAddrByName(c.masterName).Result() masterAddr, err := sentinel.GetMasterAddrByName(c.masterName).Result()