mirror
/
redis
mirror of https://github.com/go-redis/redis.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1073 from go-redis/fix/failover-dialer-when-available 

Use Dialer in Sentinel failover when available
This commit is contained in:
Vladimir Mihailenco 2019-06-29 12:53:26 +03:00 committed by GitHub
parent 056d737e55 cdfe26b83c
commit 73d3c18522
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sentinel.go
View File

@ -306,8 +306,9 @@ func (c *sentinelFailover) Close() error {
func (c *sentinelFailover) Pool() *pool.ConnPool { func (c *sentinelFailover) Pool() *pool.ConnPool {
c.poolOnce.Do(func() { c.poolOnce.Do(func() {
c.opt.Dialer = c.dial opt := *c.opt
c.pool = newConnPool(c.opt) opt.Dialer = c.dial
c.pool = newConnPool(&opt)
}) })
return c.pool return c.pool
} }
@ -317,6 +318,9 @@ func (c *sentinelFailover) dial(ctx context.Context, network, addr string) (net.
if err != nil { if err != nil {
return nil, err return nil, err
} }
if c.opt.Dialer != nil {
return c.opt.Dialer(ctx, network, addr)
}
return net.DialTimeout("tcp", addr, c.opt.DialTimeout) return net.DialTimeout("tcp", addr, c.opt.DialTimeout)
} }