Merge pull request #2551 from meirf/set-error-to-set-deadline-call

reset err value to SetDeadline return
This commit is contained in:
Eric Tune 2014-11-24 09:21:21 -08:00
commit 517bb074c2

View File

@ -204,7 +204,7 @@ func (udp *udpProxySocket) ProxyLoop(service string, info *serviceInfo, proxier
} }
continue continue
} }
svrConn.SetDeadline(time.Now().Add(info.timeout)) err = svrConn.SetDeadline(time.Now().Add(info.timeout))
if err != nil { if err != nil {
glog.Errorf("SetDeadline failed: %v", err) glog.Errorf("SetDeadline failed: %v", err)
continue continue
@ -248,7 +248,7 @@ func (udp *udpProxySocket) proxyClient(cliAddr net.Addr, svrConn net.Conn, activ
} }
break break
} }
svrConn.SetDeadline(time.Now().Add(timeout)) err = svrConn.SetDeadline(time.Now().Add(timeout))
if err != nil { if err != nil {
glog.Errorf("SetDeadline failed: %v", err) glog.Errorf("SetDeadline failed: %v", err)
break break