From 19868163bb878b0db63dfc4a7319d1fe829a47df Mon Sep 17 00:00:00 2001 From: svaroqui Date: Sat, 25 Mar 2017 17:38:38 +0100 Subject: [PATCH] Init each cluster with the default before itself --- cluster/topology.go | 1 - main.go | 4 +++- state/state.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cluster/topology.go b/cluster/topology.go index 2801b3668..a75a7740f 100644 --- 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 index 6da31710d..3ab6db88c 100644 --- 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 index e58f8afbc..59730f3f3 100644 --- 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()