From cd5993467de05fe592f95fb57a72810373a04ff8 Mon Sep 17 00:00:00 2001 From: DanB Date: Sun, 1 May 2016 18:42:08 +0200 Subject: [PATCH] Diameter fix for config loading in case of pubsubs --- config/config_json_test.go | 2 +- config/daconfig.go | 6 +++--- config/libconfig_json.go | 2 +- engine/cdrs.go | 1 - engine/stats.go | 1 - 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/config/config_json_test.go b/config/config_json_test.go index 520298908..c879439cf 100644 --- a/config/config_json_test.go +++ b/config/config_json_test.go @@ -460,7 +460,7 @@ func TestDiameterAgentJsonCfg(t *testing.T) { &HaPoolJsonCfg{ Address: utils.StringPointer(utils.MetaInternal), }}, - Pubsub_conns: nil, + Pubsubs_conns: &[]*HaPoolJsonCfg{}, Create_cdr: utils.BoolPointer(true), Debit_interval: utils.StringPointer("5m"), Timezone: utils.StringPointer(""), diff --git a/config/daconfig.go b/config/daconfig.go index ee7adad15..d309a2290 100644 --- a/config/daconfig.go +++ b/config/daconfig.go @@ -61,9 +61,9 @@ func (self *DiameterAgentCfg) loadFromJsonCfg(jsnCfg *DiameterAgentJsonCfg) erro self.SMGenericConns[idx].loadFromJsonCfg(jsnHaCfg) } } - if jsnCfg.Pubsub_conns != nil { - self.PubSubConns = make([]*HaPoolConfig, len(*jsnCfg.Pubsub_conns)) - for idx, jsnHaCfg := range *jsnCfg.Pubsub_conns { + if jsnCfg.Pubsubs_conns != nil { + self.PubSubConns = make([]*HaPoolConfig, len(*jsnCfg.Pubsubs_conns)) + for idx, jsnHaCfg := range *jsnCfg.Pubsubs_conns { self.PubSubConns[idx] = NewDfltHaPoolConfig() self.PubSubConns[idx].loadFromJsonCfg(jsnHaCfg) } diff --git a/config/libconfig_json.go b/config/libconfig_json.go index d05c7200e..eb2bf969b 100644 --- a/config/libconfig_json.go +++ b/config/libconfig_json.go @@ -255,7 +255,7 @@ type DiameterAgentJsonCfg struct { Listen *string // address where to listen for diameter requests Dictionaries_dir *string // path towards additional dictionaries Sm_generic_conns *[]*HaPoolJsonCfg // Connections towards generic SM - Pubsub_conns *[]*HaPoolJsonCfg // connection towards pubsubs + Pubsubs_conns *[]*HaPoolJsonCfg // connection towards pubsubs Create_cdr *bool Debit_interval *string Timezone *string // timezone for timestamps where not specified <""|UTC|Local|$IANA_TZ_DB> diff --git a/engine/cdrs.go b/engine/cdrs.go index a8bfbd3c3..285666ae7 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -243,7 +243,6 @@ func (self *CdrServer) deriveRateStoreStatsReplicate(cdr *CDR, store, stats, rep } var ratedCDRs []*CDR // Gather all CDRs received from rating subsystem for _, cdrRun := range cdrRuns { - utils.Logger.Debug(fmt.Sprintf("Processing CDR run: %+v", cdrRun)) if err := LoadUserProfile(cdrRun, utils.EXTRA_FIELDS); err != nil { utils.Logger.Err(fmt.Sprintf(" UserS handling for CDR %+v, got error: %s", cdrRun, err.Error())) continue diff --git a/engine/stats.go b/engine/stats.go index b84fda549..571615ec6 100644 --- a/engine/stats.go +++ b/engine/stats.go @@ -289,7 +289,6 @@ func (s *Stats) setupQueueSaver(sq *StatsQueue) { func (s *Stats) AppendCDR(cdr *CDR, out *int) error { s.mux.RLock() defer s.mux.RUnlock() - utils.Logger.Debug(fmt.Sprintf("Stats.AppendCDR: %+v", cdr)) for _, sq := range s.queues { sq.AppendCDR(cdr) }