diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go index d06ea90dd..a851be6cd 100644 --- a/services/dnsagent_it_test.go +++ b/services/dnsagent_it_test.go @@ -100,3 +100,78 @@ func TestDNSAgentReload(t *testing.T) { shdChan.CloseOnce() time.Sleep(10 * time.Millisecond) } + +/* +func TestDNSAgentReload2(t *testing.T) { + cfg := config.NewDefaultCGRConfig() + cfg.SessionSCfg().Enabled = true + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger.SetLogLevel(7) + filterSChan := make(chan *engine.FilterS, 1) + filterSChan <- nil + shdChan := utils.NewSyncedChan() + shdWg := new(sync.WaitGroup) + chS := engine.NewCacheS(cfg, nil, nil) + + cacheSChan := make(chan rpcclient.ClientConnector, 1) + cacheSChan <- chS + + server := cores.NewServer(nil) + srvMngr := servmanager.NewServiceManager(cfg, shdChan, shdWg) + srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} + db := NewDataDBService(cfg, nil, srvDep) + anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, make(chan rpcclient.ClientConnector, 1), srvDep) + sS := NewSessionService(cfg, db, server, make(chan rpcclient.ClientConnector, 1), + shdChan, nil, nil, anz, srvDep) + srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, srvDep) + engine.NewConnManager(cfg, nil) + srvMngr.AddServices(srv, sS, + NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz, srvDep), db) + if err := srvMngr.StartServices(); err != nil { + t.Fatal(err) + } + if srv.IsRunning() { + t.Errorf("Expected service to be down") + } + var reply string + if err := cfg.V1ReloadConfig(&config.ReloadArgs{ + Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "dnsagent_mongo"), + Section: config.DNSAgentJson, + }, &reply); err != nil { + t.Fatal(err) + } else if reply != utils.OK { + t.Errorf("Expecting OK ,received %s", reply) + } + time.Sleep(10 * time.Millisecond) //need to switch to gorutine + if !srv.IsRunning() { + t.Errorf("Expected service to be running") + } + err := srv.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + cfg.DNSAgentCfg().Listen = "string_test" + err = srv.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + err = db.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + + err = srv.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + + cfg.DNSAgentCfg().Enabled = false + cfg.GetReloadChan(config.DNSAgentJson) <- struct{}{} + time.Sleep(10 * time.Millisecond) + if srv.IsRunning() { + t.Errorf("Expected service to be down") + } + shdChan.CloseOnce() + time.Sleep(10 * time.Millisecond) +} +*/ diff --git a/services/stordb_it_test.go b/services/stordb_it_test.go index 06253fd07..cd1cdb234 100644 --- a/services/stordb_it_test.go +++ b/services/stordb_it_test.go @@ -146,3 +146,117 @@ func TestStorDBReload(t *testing.T) { shdChan.CloseOnce() time.Sleep(10 * time.Millisecond) } + +func TestStorDBReload2(t *testing.T) { + cfg := config.NewDefaultCGRConfig() + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger.SetLogLevel(7) + filterSChan := make(chan *engine.FilterS, 1) + filterSChan <- nil + shdChan := utils.NewSyncedChan() + shdWg := new(sync.WaitGroup) + chS := engine.NewCacheS(cfg, nil, nil) + cfg.ChargerSCfg().Enabled = true + server := cores.NewServer(nil) + srvMngr := servmanager.NewServiceManager(cfg, shdChan, shdWg) + srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} + db := NewDataDBService(cfg, nil, srvDep) + cfg.StorDbCfg().Password = "CGRateS.org" + stordb := NewStorDBService(cfg, srvDep) + anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, make(chan rpcclient.ClientConnector, 1), srvDep) + chrS := NewChargerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz, srvDep) + schS := NewSchedulerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz, srvDep) + ralS := NewRalService(cfg, chS, server, + make(chan rpcclient.ClientConnector, 1), + make(chan rpcclient.ClientConnector, 1), + shdChan, nil, anz, srvDep) + cdrsRPC := make(chan rpcclient.ClientConnector, 1) + cdrS := NewCDRServer(cfg, db, stordb, filterSChan, server, + cdrsRPC, nil, anz, srvDep) + srvMngr.AddServices(cdrS, ralS, schS, chrS, + NewLoaderService(cfg, db, filterSChan, server, + make(chan rpcclient.ClientConnector, 1), nil, anz, srvDep), db, stordb) + if err := srvMngr.StartServices(); err != nil { + t.Error(err) + } + if cdrS.IsRunning() { + t.Errorf("Expected service to be down") + } + + if stordb.IsRunning() { + t.Errorf("Expected service to be down") + } + + cfg.RalsCfg().Enabled = true + var reply string + if err := cfg.V1ReloadConfig(&config.ReloadArgs{ + Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), + Section: config.CDRS_JSN, + }, &reply); err != nil { + t.Error(err) + } else if reply != utils.OK { + t.Errorf("Expecting OK ,received %s", reply) + } + err := stordb.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + if err := cfg.V1ReloadConfig(&config.ReloadArgs{ + Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), + Section: config.STORDB_JSN, + }, &reply); err != nil { + t.Error(err) + } else if reply != utils.OK { + t.Errorf("Expecting OK ,received %s", reply) + } + select { + case d := <-cdrsRPC: + cdrsRPC <- d + case <-time.After(time.Second): + t.Fatal("It took to long to reload the cache") + } + if !cdrS.IsRunning() { + t.Errorf("Expected service to be running") + } + if !stordb.IsRunning() { + t.Errorf("Expected service to be running") + } + + err = cdrS.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + + err = stordb.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + cfg.StorDbCfg().Type = utils.INTERNAL + err = stordb.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + + err = stordb.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + + err = cdrS.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + err = cdrS.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + + cfg.CdrsCfg().Enabled = false + cfg.GetReloadChan(config.CDRS_JSN) <- struct{}{} + time.Sleep(10 * time.Millisecond) + if cdrS.IsRunning() { + t.Errorf("Expected service to be down") + } + shdChan.CloseOnce() + time.Sleep(10 * time.Millisecond) +}