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 #1110 from kollektiv/dial-context 

Use DialContext by default
This commit is contained in:
Vladimir Mihailenco 2019-07-31 10:58:11 +03:00 committed by GitHub
parent e58b0108b1 0ecf16e773
commit 0cf98f9217
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
options.go
View File

@ -112,7 +112,7 @@ func (opt *Options) init() {
KeepAlive: 5 * time.Minute, KeepAlive: 5 * time.Minute,
} }
if opt.TLSConfig == nil { if opt.TLSConfig == nil {
return netDialer.Dial(network, addr) return netDialer.DialContext(ctx, network, addr)
} }
return tls.DialWithDialer(netDialer, opt.Network, opt.Addr, opt.TLSConfig) return tls.DialWithDialer(netDialer, opt.Network, opt.Addr, opt.TLSConfig)
} }

3
redis_test.go
View File

@ -51,7 +51,8 @@ var _ = Describe("Client", func() {
Network: "tcp", Network: "tcp",
Addr: redisAddr, Addr: redisAddr,
Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) { Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) {
return net.Dial(network, addr) var d net.Dialer
return d.DialContext(ctx, network, addr)
}, },
}) })