Close probe connection, don't fatal

This commit is contained in:
Enric Lluelles
2016-05-23 15:46:11 +02:00
parent 8c74ae9ef1
commit f98f451907
+5 -2
View File
@@ -81,7 +81,7 @@ func proxy(local io.ReadWriteCloser, remoteAddr *net.TCPAddr) {
func getMasterAddr(sentinelAddress *net.TCPAddr, masterName string) (*net.TCPAddr, error) { func getMasterAddr(sentinelAddress *net.TCPAddr, masterName string) (*net.TCPAddr, error) {
conn, err := net.DialTCP("tcp", nil, sentinelAddress) conn, err := net.DialTCP("tcp", nil, sentinelAddress)
if err != nil { if err != nil {
log.Fatal("Error connecting to sentinel: %s", err) return nil, err
} }
defer conn.Close() defer conn.Close()
@@ -110,7 +110,10 @@ func getMasterAddr(sentinelAddress *net.TCPAddr, masterName string) (*net.TCPAdd
} }
//check that there's actually someone listening on that address //check that there's actually someone listening on that address
_, err = net.DialTCP("tcp", nil, addr) conn2, err := net.DialTCP("tcp", nil, addr)
if err == nil {
defer conn2.Close()
}
return addr, err return addr, err
} }