Merge pull request #1028 from go-redis/fix/dialer-net-addr

Pass network and addr to dialer

Author: vmihailenco

cluster.go

@@ -53,6 +53,8 @@ type ClusterOptions struct {
 
 	// Following options are copied from Options struct.
 
+	Dialer func(network, addr string) (net.Conn, error)
+
 	OnConnect func(*Conn) error
 
 	Password string
@@ -122,6 +124,7 @@ func (opt *ClusterOptions) clientOptions() *Options {
 	const disableIdleCheck = -1
 
 	return &Options{
+		Dialer:    opt.Dialer,
 		OnConnect: opt.OnConnect,
 
 		MaxRetries:      opt.MaxRetries,

go.mod

@@ -4,3 +4,5 @@ require (
 	github.com/onsi/ginkgo v1.8.0
 	github.com/onsi/gomega v1.5.0
 )
+
+go 1.13

options.go

@@ -34,7 +34,7 @@ type Options struct {
 
 	// Dialer creates new network connection and has priority over
 	// Network and Addr options.
-	Dialer func() (net.Conn, error)
+	Dialer func(network, addr string) (net.Conn, error)
 
 	// Hook that is called when new connection is established.
 	OnConnect func(*Conn) error
@@ -105,13 +105,13 @@ func (opt *Options) init() {
 		opt.Addr = "localhost:6379"
 	}
 	if opt.Dialer == nil {
-		opt.Dialer = func() (net.Conn, error) {
+		opt.Dialer = func(network, addr string) (net.Conn, error) {
 			netDialer := &net.Dialer{
 				Timeout:   opt.DialTimeout,
 				KeepAlive: 5 * time.Minute,
 			}
 			if opt.TLSConfig == nil {
-				return netDialer.Dial(opt.Network, opt.Addr)
+				return netDialer.Dial(network, addr)
 			} else {
 				return tls.DialWithDialer(netDialer, opt.Network, opt.Addr, opt.TLSConfig)
 			}
@@ -215,7 +215,9 @@ func ParseURL(redisURL string) (*Options, error) {
 
 func newConnPool(opt *Options) *pool.ConnPool {
 	return pool.NewConnPool(&pool.Options{
-		Dialer:             opt.Dialer,
+		Dialer: func() (net.Conn, error) {
+			return opt.Dialer(opt.Network, opt.Addr)
+		},
 		PoolSize:           opt.PoolSize,
 		MinIdleConns:       opt.MinIdleConns,
 		MaxConnAge:         opt.MaxConnAge,

redis_test.go

@@ -39,9 +39,10 @@ var _ = Describe("Client", func() {
 
 	It("should support custom dialers", func() {
 		custom := redis.NewClient(&redis.Options{
-			Addr: ":1234",
-			Dialer: func() (net.Conn, error) {
-				return net.Dial("tcp", redisAddr)
+			Network: "tcp",
+			Addr:    redisAddr,
+			Dialer: func(network, addr string) (net.Conn, error) {
+				return net.Dial(network, addr)
 			},
 		})
 

sentinel.go

@@ -24,6 +24,7 @@ type FailoverOptions struct {
 
 	// Following options are copied from Options struct.
 
+	Dialer    func(network, addr string) (net.Conn, error)
 	OnConnect func(*Conn) error
 
 	Password string
@@ -49,8 +50,8 @@ type FailoverOptions struct {
 
 func (opt *FailoverOptions) options() *Options {
 	return &Options{
-		Addr: "FailoverClient",
-
+		Addr:      "FailoverClient",
+		Dialer:    opt.Dialer,
 		OnConnect: opt.OnConnect,
 
 		DB:       opt.DB,
@@ -227,7 +228,7 @@ func (c *sentinelFailover) Pool() *pool.ConnPool {
 	return c.pool
 }
 
-func (c *sentinelFailover) dial() (net.Conn, error) {
+func (c *sentinelFailover) dial(network, addr string) (net.Conn, error) {
 	addr, err := c.MasterAddr()
 	if err != nil {
 		return nil, err

universal.go

@@ -2,6 +2,7 @@ package redis
 
 import (
 	"crypto/tls"
+	"net"
 	"time"
 )
 
@@ -18,6 +19,7 @@ type UniversalOptions struct {
 
 	// Common options.
 
+	Dialer             func(network, addr string) (net.Conn, error)
 	OnConnect          func(*Conn) error
 	Password           string
 	MaxRetries         int
@@ -53,6 +55,7 @@ func (o *UniversalOptions) cluster() *ClusterOptions {
 
 	return &ClusterOptions{
 		Addrs:     o.Addrs,
+		Dialer:    o.Dialer,
 		OnConnect: o.OnConnect,
 
 		Password: o.Password,
@@ -88,7 +91,9 @@ func (o *UniversalOptions) failover() *FailoverOptions {
 	return &FailoverOptions{
 		SentinelAddrs: o.Addrs,
 		MasterName:    o.MasterName,
-		OnConnect:     o.OnConnect,
+
+		Dialer:    o.Dialer,
+		OnConnect: o.OnConnect,
 
 		DB:       o.DB,
 		Password: o.Password,
@@ -120,6 +125,7 @@ func (o *UniversalOptions) simple() *Options {
 
 	return &Options{
 		Addr:      addr,
+		Dialer:    o.Dialer,
 		OnConnect: o.OnConnect,
 
 		DB:       o.DB,