redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-10-29 05:29:22 +03:00
Code Activity

Merge pull request #1419 from lsytj0413/fix-default-dialtimeout

Browse Source 
feat(option): default dialtimeout take effect when dialer is nil
This commit is contained in:
Vladimir Mihailenco
2020-07-24 16:21:00 +03:00
committed by GitHub
parent 8d96c4bc30 d184d958d7
commit dd8e70ad43
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
options.go
View File

@@ -120,6 +120,9 @@ func (opt *Options) init() {
opt.Network = "tcp"
}
}
if opt.DialTimeout == 0 {
opt.DialTimeout = 5 * time.Second
}
if opt.Dialer == nil {
opt.Dialer = func(ctx context.Context, network, addr string) (net.Conn, error) {
netDialer := &net.Dialer{
@@ -135,9 +138,6 @@ func (opt *Options) init() {
if opt.PoolSize == 0 {
opt.PoolSize = 10 * runtime.NumCPU()
}
if opt.DialTimeout == 0 {
opt.DialTimeout = 5 * time.Second
}
switch opt.ReadTimeout {
case -1:
opt.ReadTimeout = 0