Browse Source

revert unwanted changed in response to https://github.com/Shopify/sarama/pull/493 comments

Andrea Lusuardi - uovobw 10 years ago
parent
commit
589446225f
1 changed files with 4 additions and 3 deletions
  1. 4 3
      broker.go

+ 4 - 3
broker.go

@@ -69,12 +69,13 @@ func (b *Broker) Open(conf *Config) error {
 	go withRecover(func() {
 	go withRecover(func() {
 		defer b.lock.Unlock()
 		defer b.lock.Unlock()
 
 
-		dialer := &net.Dialer{
-			Timeout: conf.Net.DialTimeout,
+		dialer := net.Dialer{
+			Timeout:   conf.Net.DialTimeout,
+			KeepAlive: conf.Net.KeepAlive,
 		}
 		}
 
 
 		if conf.Net.TLS.Enable {
 		if conf.Net.TLS.Enable {
-			b.conn, b.connErr = tls.DialWithDialer(dialer, "tcp", b.addr, conf.Net.TLS.Config)
+			b.conn, b.connErr = tls.DialWithDialer(&dialer, "tcp", b.addr, conf.Net.TLS.Config)
 		} else {
 		} else {
 			b.conn, b.connErr = dialer.Dial("tcp", b.addr)
 			b.conn, b.connErr = dialer.Dial("tcp", b.addr)
 		}
 		}