From da8c468c0cfa569b8310abf3f557c1106820090e Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Fri, 20 Sep 2024 18:58:18 +0300 Subject: [PATCH] Remove unused parameters from fs connect func --- services/freeswitchagent.go | 6 ++--- services/freeswitchagent_it_test.go | 36 ----------------------------- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/services/freeswitchagent.go b/services/freeswitchagent.go index a333dca82..018208981 100644 --- a/services/freeswitchagent.go +++ b/services/freeswitchagent.go @@ -63,7 +63,7 @@ func (fS *FreeswitchAgent) Start(_ *context.Context, shtDwn context.CancelFunc) fS.fS = agents.NewFSsessions(fS.cfg.FsAgentCfg(), fS.cfg.GeneralCfg().DefaultTimezone, fS.connMgr) - go fS.connect(fS.fS, shtDwn) + go fS.connect(shtDwn) return } @@ -75,11 +75,11 @@ func (fS *FreeswitchAgent) Reload(_ *context.Context, shtDwn context.CancelFunc) return } fS.fS.Reload() - go fS.connect(fS.fS, shtDwn) + go fS.connect(shtDwn) return } -func (fS *FreeswitchAgent) connect(f *agents.FSsessions, shtDwn context.CancelFunc) (err error) { +func (fS *FreeswitchAgent) connect(shtDwn context.CancelFunc) { if err := fS.fS.Connect(); err != nil { utils.Logger.Err(fmt.Sprintf("<%s> error: %s!", utils.FreeSWITCHAgent, err)) shtDwn() // stop the engine here diff --git a/services/freeswitchagent_it_test.go b/services/freeswitchagent_it_test.go index 55817b330..d6852e15b 100644 --- a/services/freeswitchagent_it_test.go +++ b/services/freeswitchagent_it_test.go @@ -145,42 +145,6 @@ func TestFreeSwitchAgentReload4(t *testing.T) { if srv.IsRunning() { t.Fatalf("Expected service to be down") } - agentCfg := &config.FsAgentCfg{ - Enabled: true, - SessionSConns: nil, - SubscribePark: true, - CreateCDR: true, - ExtraFields: nil, - LowBalanceAnnFile: "", - EmptyBalanceContext: "", - EmptyBalanceAnnFile: "", - MaxWaitConnection: 0, - EventSocketConns: []*config.FsConnCfg{ - { - Address: "", - Password: "", - Reconnects: 0, - Alias: "", - }, - }, - } - srv.(*FreeswitchAgent).fS = agents.NewFSsessions(agentCfg, "", nil) - err := srv.(*FreeswitchAgent).connect(srv.(*FreeswitchAgent).fS, func() {}) - if err != nil { - t.Fatalf("\nExpected <%+v>, \nReceived <%+v>", nil, err) - } -} - -func TestFreeSwitchAgentReload5(t *testing.T) { - cfg := config.NewDefaultCGRConfig() - cfg.SessionSCfg().Enabled = true - filterSChan := make(chan *engine.FilterS, 1) - filterSChan <- nil - srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} - srv := NewFreeswitchAgent(cfg, nil, srvDep) - if srv.IsRunning() { - t.Fatalf("Expected service to be down") - } srv.(*FreeswitchAgent).fS = nil ctx, cancel := context.WithCancel(context.TODO())