From 9a2809f0b56ad5706f05e91e71e277f31e12f65a Mon Sep 17 00:00:00 2001 From: Raoof Mohammed Date: Sun, 6 Sep 2015 23:44:19 -0400 Subject: [PATCH] discovery: log error only if both ssl and non-ssl srv lookups fail discovery: log error only if both ssl and non-ssl srv lookups fail Earlier we were logging as soon as one of the lookups failed. Fixes #3414 --- discovery/srv.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/discovery/srv.go b/discovery/srv.go index 4ebc3d9aa..f212c2feb 100644 --- a/discovery/srv.go +++ b/discovery/srv.go @@ -77,16 +77,19 @@ func SRVGetCluster(name, dns string, defaultToken string, apurls types.URLs) (st failCount := 0 err := updateNodeMap("etcd-server-ssl", "https://") + srvErr := make([]string, 2) if err != nil { - plog.Warningf("error querying DNS SRV records for _etcd-server-ssl %s", err) + srvErr[0] = fmt.Sprintf("error querying DNS SRV records for _etcd-server-ssl %s", err) failCount += 1 } err = updateNodeMap("etcd-server", "http://") if err != nil { - plog.Warningf("discovery: error querying DNS SRV records for _etcd-server %s", err) + srvErr[1] = fmt.Sprintf("error querying DNS SRV records for _etcd-server %s", err) failCount += 1 } if failCount == 2 { + plog.Warningf(srvErr[0]) + plog.Warningf(srvErr[1]) plog.Errorf("SRV discovery failed: too many errors querying DNS SRV records") return "", "", err }