redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-07-28 06:42:00 +03:00
Code Activity

Add Dialer option.

Browse Source
This commit is contained in:
Vladimir Mihailenco
2014-09-30 11:46:56 +03:00
parent 593d5d1d77
commit 2508d0a57e
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
redis.go
View File

@ -152,7 +152,13 @@ type options struct {
}
type Options struct {
Addr string
Network string
Addr string
// Dialer creates new network connection and has priority over
// Network and Addr options.
Dialer func() (net.Conn, error)
Password string
DB int64
@ -196,10 +202,13 @@ type Client struct {
*baseClient
}
func newClient(clOpt *Options, network string) *Client {
func NewClient(clOpt *Options) *Client {
opt := clOpt.options()
dialer := func() (net.Conn, error) {
return net.DialTimeout(network, clOpt.Addr, opt.DialTimeout)
dialer := clOpt.Dialer
if dialer == nil {
dialer = func() (net.Conn, error) {
return net.DialTimeout(clOpt.Network, clOpt.Addr, opt.DialTimeout)
}
}
return &Client{
baseClient: &baseClient{
@ -209,10 +218,14 @@ func newClient(clOpt *Options, network string) *Client {
}
}
// Deprecated. Use NewClient instead.
func NewTCPClient(opt *Options) *Client {
return newClient(opt, "tcp")
opt.Network = "tcp"
return NewClient(opt)
}
// Deprecated. Use NewClient instead.
func NewUnixClient(opt *Options) *Client {
return newClient(opt, "unix")
opt.Network = "unix"
return NewClient(opt)
}