diff --git a/services/dnsagent.go b/services/dnsagent.go index 63a154c40..6fa9266c7 100644 --- a/services/dnsagent.go +++ b/services/dnsagent.go @@ -87,12 +87,12 @@ func (dns *DNSAgent) Reload() (err error) { if dns.oldListen == dns.cfg.DNSAgentCfg().Listen { return } - if err = dns.Shutdown(); err != nil { + dns.Lock() + defer dns.Unlock() + if err = dns.dns.Shutdown(); err != nil { return } - dns.Lock() dns.oldListen = dns.cfg.DNSAgentCfg().Listen - defer dns.Unlock() if err = dns.dns.Reload(); err != nil { return } diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go index a851be6cd..0b60f737f 100644 --- a/services/dnsagent_it_test.go +++ b/services/dnsagent_it_test.go @@ -101,7 +101,6 @@ func TestDNSAgentReload(t *testing.T) { time.Sleep(10 * time.Millisecond) } -/* func TestDNSAgentReload2(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true @@ -150,7 +149,14 @@ func TestDNSAgentReload2(t *testing.T) { if err == nil || err != utils.ErrServiceAlreadyRunning { t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) } - cfg.DNSAgentCfg().Listen = "string_test" + + castSrv, canCastSrv := srv.(*DNSAgent) + if !canCastSrv { + t.Fatalf("cannot cast") + } + + castSrv.oldListen = "test_string" + err = srv.Reload() if err != nil { t.Errorf("\nExpecting ,\n Received <%+v>", err) @@ -164,7 +170,7 @@ func TestDNSAgentReload2(t *testing.T) { if err != nil { t.Errorf("\nExpecting ,\n Received <%+v>", err) } - + time.Sleep(10 * time.Millisecond) cfg.DNSAgentCfg().Enabled = false cfg.GetReloadChan(config.DNSAgentJson) <- struct{}{} time.Sleep(10 * time.Millisecond) @@ -174,4 +180,3 @@ func TestDNSAgentReload2(t *testing.T) { shdChan.CloseOnce() time.Sleep(10 * time.Millisecond) } -*/ diff --git a/services/sipagent.go b/services/sipagent.go index 12625144d..f4648cdfc 100644 --- a/services/sipagent.go +++ b/services/sipagent.go @@ -88,10 +88,8 @@ func (sip *SIPAgent) Reload() (err error) { if sip.oldListen == sip.cfg.SIPAgentCfg().Listen { return } - if err = sip.Shutdown(); err != nil { - return - } sip.Lock() + sip.sip.Shutdown() sip.oldListen = sip.cfg.SIPAgentCfg().Listen sip.Unlock() go func() { diff --git a/services/sipagent_it_test.go b/services/sipagent_it_test.go index b88218574..4b6042fc2 100644 --- a/services/sipagent_it_test.go +++ b/services/sipagent_it_test.go @@ -82,10 +82,17 @@ func TestSIPAgentReload(t *testing.T) { if srvStart != utils.ErrServiceAlreadyRunning { t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, srvStart) } + castSrv, canCastSrv := srv.(*SIPAgent) + if !canCastSrv { + t.Fatalf("cannot cast") + } + castSrv.oldListen = "test_string" + err := srv.Reload() if err != nil { t.Errorf("\nExpecting ,\n Received <%+v>", err) } + time.Sleep(10 * time.Millisecond) cfg.SIPAgentCfg().Enabled = false cfg.GetReloadChan(config.SIPAgentJson) <- struct{}{} time.Sleep(10 * time.Millisecond) @@ -95,3 +102,69 @@ func TestSIPAgentReload(t *testing.T) { shdChan.CloseOnce() time.Sleep(10 * time.Millisecond) } + +/* +func TestSIPAgentReload2(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 := NewSIPAgent(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", "sipagent_mysql"), + Section: config.SIPAgentJson, + }, &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") + } + srvStart := srv.Start() + if srvStart != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, srvStart) + } + err := srv.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + time.Sleep(10 * time.Millisecond) + cfg.SIPAgentCfg().Enabled = false + cfg.GetReloadChan(config.SIPAgentJson) <- struct{}{} + time.Sleep(10 * time.Millisecond) + if srv.IsRunning() { + t.Errorf("Expected service to be down") + } + shdChan.CloseOnce() + time.Sleep(10 * time.Millisecond) +} +*/