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

etcd: move s.ClusterConfig to v2_admin.go

Browse Source
This commit is contained in:
Xiang Li 2014-07-16 22:54:58 -07:00 committed by Yicheng Qin
parent da19964959
commit a50857d38a
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etcd/etcd.go
View File

@ -160,16 +160,6 @@ func (s *Server) RaftHandler() http.Handler {
return s.rh return s.rh
} }
func (s *Server) ClusterConfig() *config.ClusterConfig {
c := config.NewClusterConfig()
// This is used for backward compatibility because it doesn't
// set cluster config in older version.
if e, err := s.Get(v2configKVPrefix, false, false); err == nil {
json.Unmarshal([]byte(*e.Node.Value), c)
}
return c
}
func (s *Server) Run() { func (s *Server) Run() {
if len(s.config.Peers) == 0 { if len(s.config.Peers) == 0 {
s.Bootstrap() s.Bootstrap()

11
etcd/v2_admin.go
View File

@ -9,6 +9,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/coreos/etcd/config"
"github.com/coreos/etcd/store" "github.com/coreos/etcd/store"
) )
@ -101,6 +102,16 @@ func (s *Server) serveAdminMachines(w http.ResponseWriter, r *http.Request) erro
return nil return nil
} }
func (s *Server) ClusterConfig() *config.ClusterConfig {
c := config.NewClusterConfig()
// This is used for backward compatibility because it doesn't
// set cluster config in older version.
if e, err := s.Get(v2configKVPrefix, false, false); err == nil {
json.Unmarshal([]byte(*e.Node.Value), c)
}
return c
}
// someMachineMessage return machine message of specified name. // someMachineMessage return machine message of specified name.
func (s *Server) someMachineMessage(name string) (*machineMessage, error) { func (s *Server) someMachineMessage(name string) (*machineMessage, error) {
p := filepath.Join(v2machineKVPrefix, name) p := filepath.Join(v2machineKVPrefix, name)