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 stylistic comments

Browse Source
This commit is contained in:
Barak Michener 2014-10-22 14:01:15 -04:00
parent c5d1fcd70a
commit 829cec8ccf
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etcdserver/cluster.go
View File

@ -37,8 +37,7 @@ type Cluster struct {
}
func NewCluster(clusterName string) *Cluster {
c := &Cluster{name: clusterName, members: make(map[uint64]*Member)}
return c
return &Cluster{name: clusterName, members: make(map[uint64]*Member)}
}
func (c Cluster) FindName(name string) *Member {

9
etcdserver/config.go
View File

@ -50,13 +50,8 @@ func (c *ServerConfig) VerifyBootstrapConfig() error {
}
// Make sure the cluster at least contains the local server.
isOk := false
for _, m := range c.Cluster.members {
if m.ID == c.NodeID {
isOk = true
}
}
if !isOk {
m := c.Cluster.FindID(c.NodeID)
if m == nil {
return fmt.Errorf("couldn't find local ID in cluster config")
}

6
integration/cluster_test.go
View File

@ -90,12 +90,11 @@ func (c *cluster) Launch(t *testing.T) {
l := newLocalListener(t)
// each member claims only one peer listener
lns[i] = l
listenUrls, err := types.NewURLs([]string{"http://" + l.Addr().String()})
listenURLs, err := types.NewURLs([]string{"http://" + l.Addr().String()})
if err != nil {
t.Fatal(err)
}
_, err = clusterCfg.AddMemberFromURLs(c.name(i), listenUrls)
if err != nil {
if _, err = clusterCfg.AddMemberFromURLs(c.name(i), listenURLs); err != nil {
t.Fatal(err)
}
}
@ -150,7 +149,6 @@ func newLocalListener(t *testing.T) net.Listener {
}
type member struct {
id uint64
etcdserver.ServerConfig
PeerListeners, ClientListeners []net.Listener