From c22ce5f7bbff04e57fd588491241bfc8bf391738 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Fri, 8 Nov 2019 16:07:59 +0200 Subject: [PATCH] Updated services integration tests --- cmd/cgr-engine/cgr-engine.go | 2 +- services/cdrs_it_test.go | 8 +++++--- services/rals_it_test.go | 6 ++++-- services/sessions_it_test.go | 8 +++++--- servmanager/servmanager.go | 6 +++--- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index 126229bbe..1d03b16c8 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -539,7 +539,7 @@ func main() { services.NewRadiusAgent(cfg, filterSChan, smg.GetIntenternalChan(), dspS.GetIntenternalChan(), exitChan), // partial reload services.NewDiameterAgent(cfg, filterSChan, smg.GetIntenternalChan(), dspS.GetIntenternalChan(), exitChan), // partial reload services.NewHTTPAgent(cfg, filterSChan, smg.GetIntenternalChan(), dspS.GetIntenternalChan(), server), // no reload - ldrs, anz, dspS, + ldrs, anz, dspS, dmService, storDBService, ) srvManager.StartServices() diff --git a/services/cdrs_it_test.go b/services/cdrs_it_test.go index d1a764ddd..287ad47e3 100644 --- a/services/cdrs_it_test.go +++ b/services/cdrs_it_test.go @@ -66,17 +66,19 @@ func TestCdrsReload(t *testing.T) { server := utils.NewServer() srvMngr := servmanager.NewServiceManager(cfg, engineShutdown) db := NewDataDBService(cfg) + cfg.StorDbCfg().Type = utils.INTERNAL + stordb := NewStorDBService(cfg) chrS := NewChargerService(cfg, db, chS, filterSChan, server, nil, nil) schS := NewSchedulerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.RpcClientConnection, 1), nil) tS := NewThresholdService(cfg, db, chS, filterSChan, server) - ralS := NewRalService(cfg, db, nil, nil, chS, filterSChan, server, + ralS := NewRalService(cfg, db, stordb, chS, filterSChan, server, tS.GetIntenternalChan(), internalChan, cacheSChan, internalChan, internalChan, internalChan, schS, engineShutdown) - cdrS := NewCDRServer(cfg, db, nil, filterSChan, server, + cdrS := NewCDRServer(cfg, db, stordb, filterSChan, server, make(chan rpcclient.RpcClientConnection, 1), chrS.GetIntenternalChan(), ralS.GetResponder().GetIntenternalChan(), nil, nil, nil, nil) - srvMngr.AddServices(cdrS, ralS, schS, chrS, NewLoaderService(cfg, db, filterSChan, server, cacheSChan, nil, engineShutdown), db) + srvMngr.AddServices(cdrS, ralS, schS, chrS, NewLoaderService(cfg, db, filterSChan, server, cacheSChan, nil, engineShutdown), db, stordb) if err = srvMngr.StartServices(); err != nil { t.Error(err) } diff --git a/services/rals_it_test.go b/services/rals_it_test.go index 941375321..74d5f64ea 100644 --- a/services/rals_it_test.go +++ b/services/rals_it_test.go @@ -65,12 +65,14 @@ func TestRalsReload(t *testing.T) { server := utils.NewServer() srvMngr := servmanager.NewServiceManager(cfg, engineShutdown) db := NewDataDBService(cfg) + cfg.StorDbCfg().Type = utils.INTERNAL + stordb := NewStorDBService(cfg) schS := NewSchedulerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.RpcClientConnection, 1), nil) tS := NewThresholdService(cfg, db, chS, filterSChan, server) - ralS := NewRalService(cfg, db, nil, nil, chS, filterSChan, server, + ralS := NewRalService(cfg, db, stordb, chS, filterSChan, server, tS.GetIntenternalChan(), internalChan, cacheSChan, internalChan, internalChan, internalChan, schS, engineShutdown) - srvMngr.AddServices(ralS, schS, tS, NewLoaderService(cfg, db, filterSChan, server, cacheSChan, nil, engineShutdown), db) + srvMngr.AddServices(ralS, schS, tS, NewLoaderService(cfg, db, filterSChan, server, cacheSChan, nil, engineShutdown), db, stordb) if err = srvMngr.StartServices(); err != nil { t.Error(err) } diff --git a/services/sessions_it_test.go b/services/sessions_it_test.go index 2a08e6d0e..decee7b66 100644 --- a/services/sessions_it_test.go +++ b/services/sessions_it_test.go @@ -68,18 +68,20 @@ func TestSessionSReload(t *testing.T) { server := utils.NewServer() srvMngr := servmanager.NewServiceManager(cfg, engineShutdown) db := NewDataDBService(cfg) + cfg.StorDbCfg().Type = utils.INTERNAL + stordb := NewStorDBService(cfg) chrS := NewChargerService(cfg, db, chS, filterSChan, server, nil, nil) schS := NewSchedulerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.RpcClientConnection, 1), nil) - ralS := NewRalService(cfg, db, nil, nil, chS, filterSChan, server, + ralS := NewRalService(cfg, db, stordb, chS, filterSChan, server, /*tS*/ internalChan, internalChan, cacheSChan, internalChan, internalChan, internalChan, schS, engineShutdown) - cdrS := NewCDRServer(cfg, db, nil, filterSChan, server, + cdrS := NewCDRServer(cfg, db, stordb, filterSChan, server, make(chan rpcclient.RpcClientConnection, 1), chrS.GetIntenternalChan(), ralS.GetResponder().GetIntenternalChan(), nil, nil, nil, nil) srv := NewSessionService(cfg, db, server, chrS.GetIntenternalChan(), ralS.GetResponder().GetIntenternalChan(), nil, nil, nil, nil, nil, cdrS.GetIntenternalChan(), nil, engineShutdown) - srvMngr.AddServices(srv, chrS, schS, ralS, cdrS, NewLoaderService(cfg, db, filterSChan, server, cacheSChan, nil, engineShutdown), db) + srvMngr.AddServices(srv, chrS, schS, ralS, cdrS, NewLoaderService(cfg, db, filterSChan, server, cacheSChan, nil, engineShutdown), db, stordb) if err = srvMngr.StartServices(); err != nil { t.Error(err) } diff --git a/servmanager/servmanager.go b/servmanager/servmanager.go index 3e498b7db..e3580ad64 100644 --- a/servmanager/servmanager.go +++ b/servmanager/servmanager.go @@ -315,20 +315,20 @@ func (srvMngr *ServiceManager) reloadService(srviceName string) (err error) { if srv.ShouldRun() { if srv.IsRunning() { if err = srv.Reload(); err != nil { - utils.Logger.Err(fmt.Sprintf("<%s> Failed to reload <%s>", utils.ServiceManager, srv.ServiceName())) + utils.Logger.Err(fmt.Sprintf("<%s> Failed to reload <%s> because: %s", utils.ServiceManager, srv.ServiceName(), err)) srvMngr.engineShutdown <- true return // stop if we encounter an error } } else { if err = srv.Start(); err != nil { - utils.Logger.Err(fmt.Sprintf("<%s> Failed to start <%s>", utils.ServiceManager, srv.ServiceName())) + utils.Logger.Err(fmt.Sprintf("<%s> Failed to start <%s> because: %s", utils.ServiceManager, srv.ServiceName(), err)) srvMngr.engineShutdown <- true return // stop if we encounter an error } } } else if srv.IsRunning() { if err = srv.Shutdown(); err != nil { - utils.Logger.Err(fmt.Sprintf("<%s> Failed to stop service <%s>", utils.ServiceManager, srv.ServiceName())) + utils.Logger.Err(fmt.Sprintf("<%s> Failed to stop service <%s> because: %s", utils.ServiceManager, srv.ServiceName(), err)) srvMngr.engineShutdown <- true return // stop if we encounter an error }