Browse Source

Unexport Dialer.

The design for the Dialer type is flawed and needs to be reworked.
Because Dialer was available for a very short time, I am hoping that
this change will not break an application.
Gary Burd 11 years ago
parent
commit
61e2910408
1 changed files with 4 additions and 4 deletions
  1. 4 4
      redis/conn.go

+ 4 - 4
redis/conn.go

@@ -53,7 +53,7 @@ type conn struct {
 
 
 // Dial connects to the Redis server at the given network and address.
 // Dial connects to the Redis server at the given network and address.
 func Dial(network, address string) (Conn, error) {
 func Dial(network, address string) (Conn, error) {
-	dialer := Dialer{}
+	dialer := xDialer{}
 	return dialer.Dial(network, address)
 	return dialer.Dial(network, address)
 }
 }
 
 
@@ -61,7 +61,7 @@ func Dial(network, address string) (Conn, error) {
 // connection to the server, writing a command and reading a reply.
 // connection to the server, writing a command and reading a reply.
 func DialTimeout(network, address string, connectTimeout, readTimeout, writeTimeout time.Duration) (Conn, error) {
 func DialTimeout(network, address string, connectTimeout, readTimeout, writeTimeout time.Duration) (Conn, error) {
 	netDialer := net.Dialer{Timeout: connectTimeout}
 	netDialer := net.Dialer{Timeout: connectTimeout}
-	dialer := Dialer{
+	dialer := xDialer{
 		NetDial:      netDialer.Dial,
 		NetDial:      netDialer.Dial,
 		ReadTimeout:  readTimeout,
 		ReadTimeout:  readTimeout,
 		WriteTimeout: writeTimeout,
 		WriteTimeout: writeTimeout,
@@ -70,7 +70,7 @@ func DialTimeout(network, address string, connectTimeout, readTimeout, writeTime
 }
 }
 
 
 // A Dialer specifies options for connecting to a Redis server.
 // A Dialer specifies options for connecting to a Redis server.
-type Dialer struct {
+type xDialer struct {
 	// NetDial specifies the dial function for creating TCP connections. If
 	// NetDial specifies the dial function for creating TCP connections. If
 	// NetDial is nil, then net.Dial is used.
 	// NetDial is nil, then net.Dial is used.
 	NetDial func(network, addr string) (net.Conn, error)
 	NetDial func(network, addr string) (net.Conn, error)
@@ -85,7 +85,7 @@ type Dialer struct {
 }
 }
 
 
 // Dial connects to the Redis server at address on the named network.
 // Dial connects to the Redis server at address on the named network.
-func (d *Dialer) Dial(network, address string) (Conn, error) {
+func (d *xDialer) Dial(network, address string) (Conn, error) {
 	dial := d.NetDial
 	dial := d.NetDial
 	if dial == nil {
 	if dial == nil {
 		dial = net.Dial
 		dial = net.Dial