From 1865d917382ea3348d0640834bdf3e27fabb1549 Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Mon, 25 Oct 2021 16:35:38 +0300 Subject: [PATCH] Fix compilation errors after adding filterSChan to SessionService struct --- services/asteriskagent_it_test.go | 4 ++-- services/diameteragent_it_test.go | 2 +- services/dnsagent_it_test.go | 2 +- services/ers_it_test.go | 2 +- services/freeswitchagent_it_test.go | 2 +- services/httpagent_it_test.go | 2 +- services/kamailioagent_it_test.go | 2 +- services/radiusagent_it_test.go | 4 ++-- services/sessions_it_test.go | 6 +++--- services/sipagent_it_test.go | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/services/asteriskagent_it_test.go b/services/asteriskagent_it_test.go index 3e8ae6561..d019ae58e 100644 --- a/services/asteriskagent_it_test.go +++ b/services/asteriskagent_it_test.go @@ -55,7 +55,7 @@ func TestAsteriskAgentReload(t *testing.T) { srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} db := NewDataDBService(cfg, nil, srvDep) anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep) - sS := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1), + sS := NewSessionService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) srv := NewAsteriskAgent(cfg, nil, srvDep) engine.NewConnManager(cfg) @@ -115,7 +115,7 @@ func TestAsteriskAgentReload2(t *testing.T) { srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} db := NewDataDBService(cfg, nil, srvDep) anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep) - sS := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1), + sS := NewSessionService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) srv := NewAsteriskAgent(cfg, nil, srvDep) engine.NewConnManager(cfg) diff --git a/services/diameteragent_it_test.go b/services/diameteragent_it_test.go index d21c61157..18ce4a979 100644 --- a/services/diameteragent_it_test.go +++ b/services/diameteragent_it_test.go @@ -49,7 +49,7 @@ func TestDiameterAgentReload1(t *testing.T) { srvMngr := servmanager.NewServiceManager(shdWg, nil, cfg.GetReloadChan()) db := NewDataDBService(cfg, nil, srvDep) anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep) - sS := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1), + sS := NewSessionService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) srv := NewDiameterAgent(cfg, filterSChan, nil, srvDep) engine.NewConnManager(cfg) diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go index 8ebd68f2c..1387c1664 100644 --- a/services/dnsagent_it_test.go +++ b/services/dnsagent_it_test.go @@ -57,7 +57,7 @@ func TestDNSAgentReload(t *testing.T) { srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} db := NewDataDBService(cfg, nil, srvDep) anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep) - sS := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1), + sS := NewSessionService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) srv := NewDNSAgent(cfg, filterSChan, nil, srvDep) engine.NewConnManager(cfg) diff --git a/services/ers_it_test.go b/services/ers_it_test.go index 576ccde73..e72ba9853 100644 --- a/services/ers_it_test.go +++ b/services/ers_it_test.go @@ -66,7 +66,7 @@ func TestEventReaderSReload(t *testing.T) { srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep) db := NewDataDBService(cfg, nil, srvDep) - sS := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) + sS := NewSessionService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) erS := NewEventReaderService(cfg, filterSChan, nil, srvDep) engine.NewConnManager(cfg) srvMngr.AddServices(erS, sS, diff --git a/services/freeswitchagent_it_test.go b/services/freeswitchagent_it_test.go index bcb3d59d9..557a99659 100644 --- a/services/freeswitchagent_it_test.go +++ b/services/freeswitchagent_it_test.go @@ -57,7 +57,7 @@ func TestFreeSwitchAgentReload(t *testing.T) { srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} db := NewDataDBService(cfg, nil, srvDep) anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep) - sS := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1), + sS := NewSessionService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) srv := NewFreeswitchAgent(cfg, nil, srvDep) engine.NewConnManager(cfg) diff --git a/services/httpagent_it_test.go b/services/httpagent_it_test.go index 579900ddb..0296e36f3 100644 --- a/services/httpagent_it_test.go +++ b/services/httpagent_it_test.go @@ -55,7 +55,7 @@ func TestHTTPAgentReload(t *testing.T) { srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} db := NewDataDBService(cfg, nil, srvDep) anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep) - sS := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1), + sS := NewSessionService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) srv := NewHTTPAgent(cfg, filterSChan, server, nil, srvDep) engine.NewConnManager(cfg) diff --git a/services/kamailioagent_it_test.go b/services/kamailioagent_it_test.go index 6e9106996..cf7e9e09f 100644 --- a/services/kamailioagent_it_test.go +++ b/services/kamailioagent_it_test.go @@ -54,7 +54,7 @@ func TestKamailioAgentReload(t *testing.T) { srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} db := NewDataDBService(cfg, nil, srvDep) anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep) - sS := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1), + sS := NewSessionService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) srv := NewKamailioAgent(cfg, nil, srvDep) engine.NewConnManager(cfg) diff --git a/services/radiusagent_it_test.go b/services/radiusagent_it_test.go index e62b24b42..003a6da1b 100644 --- a/services/radiusagent_it_test.go +++ b/services/radiusagent_it_test.go @@ -58,7 +58,7 @@ func TestRadiusAgentReload(t *testing.T) { srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} db := NewDataDBService(cfg, nil, srvDep) anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep) - sS := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1), + sS := NewSessionService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) srv := NewRadiusAgent(cfg, filterSChan, nil, srvDep) engine.NewConnManager(cfg) @@ -120,7 +120,7 @@ func TestRadiusAgentReload2(t *testing.T) { srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} db := NewDataDBService(cfg, nil, srvDep) anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep) - sS := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1), + sS := NewSessionService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) srv := NewRadiusAgent(cfg, filterSChan, nil, srvDep) engine.NewConnManager(cfg) diff --git a/services/sessions_it_test.go b/services/sessions_it_test.go index 65c074627..2facc0ac5 100644 --- a/services/sessions_it_test.go +++ b/services/sessions_it_test.go @@ -92,7 +92,7 @@ func TestSessionSReload1(t *testing.T) { conMng := engine.NewConnManager(cfg) conMng.AddInternalConn(utils.ConcatenatedKey(utils.MetaInternal, utils.MetaChargers), utils.ChargerSv1, clientConect) anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep) - srv := NewSessionService(cfg, new(DataDBService), server, make(chan birpc.ClientConnector, 1), conMng, anz, srvDep) + srv := NewSessionService(cfg, new(DataDBService), filterSChan, server, make(chan birpc.ClientConnector, 1), conMng, anz, srvDep) ctx, cancel := context.WithCancel(context.TODO()) err := srv.Start(ctx, cancel) if err != nil { @@ -156,7 +156,7 @@ func TestSessionSReload2(t *testing.T) { db := NewDataDBService(cfg, nil, srvDep) cfg.StorDbCfg().Type = utils.Internal anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep) - srv := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) + srv := NewSessionService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) engine.NewConnManager(cfg) srv.(*SessionService).sm = &sessions.SessionS{} @@ -205,7 +205,7 @@ func TestSessionSReload3(t *testing.T) { db := NewDataDBService(cfg, nil, srvDep) cfg.StorDbCfg().Type = utils.Internal anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep) - srv := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) + srv := NewSessionService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) engine.NewConnManager(cfg) err2 := srv.(*SessionService).start(func() {}) if err2 != nil { diff --git a/services/sipagent_it_test.go b/services/sipagent_it_test.go index ba716f818..37a81f851 100644 --- a/services/sipagent_it_test.go +++ b/services/sipagent_it_test.go @@ -52,7 +52,7 @@ func TestSIPAgentReload(t *testing.T) { srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} db := NewDataDBService(cfg, nil, srvDep) anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep) - sS := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1), + sS := NewSessionService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep) srv := NewSIPAgent(cfg, filterSChan, nil, srvDep) engine.NewConnManager(cfg)