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

fix #1732 

Signed-off-by: monkey <golang@88.com>
This commit is contained in:
monkey 2021-04-21 15:47:53 +08:00
parent b7720fd8e7
commit 0b855ecda5
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sentinel.go
View File

@ -219,14 +219,21 @@ func masterSlaveDialer(
failover.trySwitchMaster(ctx, addr) failover.trySwitchMaster(ctx, addr)
} }
} }
if err != nil { if err != nil {
return nil, err return nil, err
} }
if failover.opt.Dialer != nil { if failover.opt.Dialer != nil {
return failover.opt.Dialer(ctx, network, addr) return failover.opt.Dialer(ctx, network, addr)
} }
return net.DialTimeout("tcp", addr, failover.opt.DialTimeout)
netDialer := &net.Dialer{
Timeout: failover.opt.DialTimeout,
KeepAlive: 5 * time.Minute,
}
if failover.opt.TLSConfig == nil {
return netDialer.DialContext(ctx, network, addr)
}
return tls.DialWithDialer(netDialer, network, addr, failover.opt.TLSConfig)
} }
} }