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

fix from comments

Browse Source
This commit is contained in:
Barak Michener 2014-12-17 20:27:01 -05:00
parent fdad6630ea
commit 04d9f848a7
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
etcdmain/etcd.go
View File

@ -453,9 +453,11 @@ func genDNSClusterString(defaultToken string) (string, string, error) {
targetName := make(map[string]int) targetName := make(map[string]int)
stringParts := make([]string, 0) stringParts := make([]string, 0)
tempName := int(0) tempName := int(0)
_, addrs, err := lookupSRV("etcd-server-ssl", "tcp", *dnsCluster)
updateNodeMap := func(service, prefix string) error {
_, addrs, err := lookupSRV(service, "tcp", *dnsCluster)
if err != nil { if err != nil {
return "", "", err return err
} }
for _, srv := range addrs { for _, srv := range addrs {
var v int var v int
@ -465,21 +467,18 @@ func genDNSClusterString(defaultToken string) (string, string, error) {
targetName[srv.Target] = v targetName[srv.Target] = v
tempName += 1 tempName += 1
} }
stringParts = append(stringParts, fmt.Sprintf("%d=https://%s:%d", v, srv.Target, srv.Port)) stringParts = append(stringParts, fmt.Sprintf("%d=%s%s:%d", v, prefix, srv.Target, srv.Port))
} }
_, addrs, err = lookupSRV("etcd-server", "tcp", *dnsCluster) return nil
}
err := updateNodeMap("etcd-server-ssl", "https://")
if err != nil { if err != nil {
return "", "", err return "", "", err
} }
for _, srv := range addrs { err = updateNodeMap("etcd-server", "http://")
var v int if err != nil {
var ok bool return "", "", err
if v, ok = targetName[srv.Target]; !ok {
v = tempName
targetName[srv.Target] = v
tempName += 1
}
stringParts = append(stringParts, fmt.Sprintf("%d=http://%s:%d", v, srv.Target, srv.Port))
} }
return strings.Join(stringParts, ","), defaultToken, nil return strings.Join(stringParts, ","), defaultToken, nil
} }

3
etcdmain/etcd_test.go
View File

@ -100,12 +100,13 @@ func TestGenDNSClusterString(t *testing.T) {
} }
return "", nil, errors.New("Unkown service in mock") return "", nil, errors.New("Unkown service in mock")
} }
defer func() { lookupSRV = net.LookupSRV }()
str, token, err := genDNSClusterString("token") str, token, err := genDNSClusterString("token")
if err != nil { if err != nil {
t.Fatalf("%d: err: %#v", i, err) t.Fatalf("%d: err: %#v", i, err)
} }
if token != "token" { if token != "token" {
t.Error("Token doesn't match default token") t.Errorf("%d: token: %s", i, token)
} }
if str != tt.expected { if str != tt.expected {
t.Errorf("#%d: cluster = %s, want %s", i, str, tt.expected) t.Errorf("#%d: cluster = %s, want %s", i, str, tt.expected)