Init each cluster with the default before itself

tangweichun · Mar 25, 2017 · 1986816 · 1986816
1 parent 2f92977
commit 1986816
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/cluster/topology.go b/cluster/topology.go
@@ -159,7 +159,6 @@ func (cluster *Cluster) TopologyDiscover() error {
 		err := m.Connect()
 		if err != nil {
 			cluster.sme.AddState("ERR00018", state.State{ErrType: "ERROR", ErrDesc: fmt.Sprintf(clusterError["ERR00018"], err), ErrFrom: "CONF"})
-
 		}
 	}
 

diff --git a/main.go b/main.go
@@ -131,9 +131,11 @@ func initConfig() {
 		for _, gl := range cfgGroupList {
 
 			if gl != "" {
+				cf2 := viper.Sub("Default")
+				cf2.Unmarshal(&conf)
 				cfgGroup = gl
 				log.WithField("group", gl).Debug("Reading configuration group")
-				cf2 := viper.Sub(gl)
+				cf2 = viper.Sub(gl)
 				if cf2 == nil {
 					log.WithField("group", gl).Fatal("Could not parse configuration group")
 				}

diff --git a/state/state.go b/state/state.go
@@ -230,7 +230,7 @@ func (SM *StateMachine) GetStates() []string {
 func (SM *StateMachine) GetOpenStates() []string {
 	var log []string
 	SM.Lock()
-	for key, value := range *SM.CurState {
+	for key, value := range *SM.OldState {
 		log = append(log, fmt.Sprintf("%-5s: %s %s", value.ErrType, key, value.ErrDesc))
 	}
 	SM.Unlock()
-Original file line number
+Diff line change
@@ Expand Up / @@ -159,7 +159,6 @@ func (cluster *Cluster) TopologyDiscover() error { @@
     		err := m.Connect()
     		if err != nil {
     			cluster.sme.AddState("ERR00018", state.State{ErrType: "ERROR", ErrDesc: fmt.Sprintf(clusterError["ERR00018"], err), ErrFrom: "CONF"})
     		}
     	}
@@ Expand Down @@