diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index 08b398faa..2699b5f57 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -1144,7 +1144,7 @@ func main() { } } } - if cfg.RalsCfg().Enabled || cfg.CdrsCfg().CDRSEnabled { + if cfg.RalsCfg().Enabled || cfg.CdrsCfg().Enabled { storDb, err := engine.ConfigureStorStorage(cfg.StorDbCfg().StorDBType, cfg.StorDbCfg().StorDBHost, cfg.StorDbCfg().StorDBPort, cfg.StorDbCfg().StorDBName, cfg.StorDbCfg().StorDBUser, diff --git a/config/config_it_test.go b/config/config_it_test.go index 5f22328cf..e685db99e 100644 --- a/config/config_it_test.go +++ b/config/config_it_test.go @@ -281,7 +281,7 @@ func TestCGRConfigReloadCDRs(t *testing.T) { if err != nil { t.Fatal(err) } - cfg.RalsCfg().RALsEnabled = true + cfg.RalsCfg().Enabled = true var reply string if err = cfg.V1ReloadConfig(&ConfigReloadWithArgDispatcher{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), diff --git a/services/cdrs_it_test.go b/services/cdrs_it_test.go index 0d66af37e..dc1e5f334 100644 --- a/services/cdrs_it_test.go +++ b/services/cdrs_it_test.go @@ -58,7 +58,7 @@ func TestCdrsReload(t *testing.T) { close(chS.GetPrecacheChannel(utils.CacheTimings)) cfg.ChargerSCfg().Enabled = true - cfg.RalsCfg().RALsEnabled = true + cfg.RalsCfg().Enabled = true cacheSChan := make(chan rpcclient.RpcClientConnection, 1) cacheSChan <- chS server := utils.NewServer() diff --git a/services/responders.go b/services/responders.go index 42919022a..759e8af6c 100644 --- a/services/responders.go +++ b/services/responders.go @@ -50,12 +50,12 @@ func (resp *ResponderService) Start(sp servmanager.ServiceProvider, waitCache bo } var thdS, stats rpcclient.RpcClientConnection - if thdS, err = sp.GetConnection(utils.ThresholdS, sp.GetConfig().RalsCfg().RALsThresholdSConns); err != nil { + if thdS, err = sp.GetConnection(utils.ThresholdS, sp.GetConfig().RalsCfg().ThresholdSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s, error: %s", utils.RALService, utils.ThresholdS, err.Error())) return } - if stats, err = sp.GetConnection(utils.StatS, sp.GetConfig().RalsCfg().RALsStatSConns); err != nil { + if stats, err = sp.GetConnection(utils.StatS, sp.GetConfig().RalsCfg().StatSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s, error: %s", utils.RALService, utils.StatS, err.Error())) return @@ -70,7 +70,7 @@ func (resp *ResponderService) Start(sp servmanager.ServiceProvider, waitCache bo defer resp.Unlock() resp.resp = &engine.Responder{ ExitChan: sp.GetExitChan(), - MaxComputedUsage: sp.GetConfig().RalsCfg().RALsMaxComputedUsage, + MaxComputedUsage: sp.GetConfig().RalsCfg().MaxComputedUsage, } if !sp.GetConfig().DispatcherSCfg().Enabled { diff --git a/servmanager/servmanager.go b/servmanager/servmanager.go index b53d2d469..cf8ef4a24 100644 --- a/servmanager/servmanager.go +++ b/servmanager/servmanager.go @@ -271,7 +271,7 @@ func (srvMngr *ServiceManager) StartServices() (err error) { if srvMngr.GetConfig().CdrsCfg().Enabled { go srvMngr.startService(utils.CDRServer) } - if srvMngr.GetConfig().RalsCfg().RALsEnabled { + if srvMngr.GetConfig().RalsCfg().Enabled { go srvMngr.startService(utils.RALService) } // startServer() @@ -330,7 +330,7 @@ func (srvMngr *ServiceManager) handleReload() { return } case <-srvMngr.GetConfig().GetReloadChan(config.RALS_JSN): - if err = srvMngr.reloadService(utils.RALService, srvMngr.GetConfig().RalsCfg().RALsEnabled); err != nil { + if err = srvMngr.reloadService(utils.RALService, srvMngr.GetConfig().RalsCfg().Enabled); err != nil { return } }