Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3451 from raoofm/patch-1

Browse Source 
discovery: log error only if both ssl and non-ssl srv lookups fail
This commit is contained in:
Xiang Li 2015-09-06 20:54:43 -07:00
commit a44da0b62a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
discovery/srv.go
View File

@ -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
}