Merge pull request #2320 from xiang90/fix_error

etcdserver: fix error message when valide the discovery cluster
This commit is contained in:
Xiang Li 2015-02-16 09:53:24 -08:00
commit def62071f0

View File

@ -184,7 +184,7 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
if cfg.Cluster, err = NewClusterFromString(cfg.Cluster.token, s); err != nil { if cfg.Cluster, err = NewClusterFromString(cfg.Cluster.token, s); err != nil {
return nil, err return nil, err
} }
if cfg.Cluster.Validate() != nil { if err := cfg.Cluster.Validate(); err != nil {
return nil, fmt.Errorf("bad discovery cluster: %v", err) return nil, fmt.Errorf("bad discovery cluster: %v", err)
} }
} }