From 6e75c2f9fd41092d831ba5635cf75b50302c2360 Mon Sep 17 00:00:00 2001 From: porosnicuadrian Date: Mon, 17 May 2021 17:12:00 +0300 Subject: [PATCH] Fixed error when there are not sessionIds in case of ActiveSessions --- agents/astagent.go | 3 +++ agents/fsagent.go | 3 +++ agents/kamagent.go | 3 +++ sessions/sessions.go | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/agents/astagent.go b/agents/astagent.go index bdd4763e7..372a5bd7f 100644 --- a/agents/astagent.go +++ b/agents/astagent.go @@ -349,6 +349,9 @@ func (sma *AsteriskAgent) V1GetActiveSessionIDs(ignParam string, return err } var sIDs []*sessions.SessionID + if len(slMpIface) == 0 { + return utils.ErrNoActiveSession + } for _, mpIface := range slMpIface { sIDs = append(sIDs, &sessions.SessionID{ OriginHost: strings.Split(sma.cgrCfg.AsteriskAgentCfg().AsteriskConns[sma.astConnIdx].Address, ":")[0], diff --git a/agents/fsagent.go b/agents/fsagent.go index 4279ea44d..074bace4b 100644 --- a/agents/fsagent.go +++ b/agents/fsagent.go @@ -432,6 +432,9 @@ func (fsa *FSsessions) V1GetActiveSessionIDs(_ string, }) } } + if len(sIDs) == 0 { + return utils.ErrNoActiveSession + } *sessionIDs = sIDs return } diff --git a/agents/kamagent.go b/agents/kamagent.go index 387ed7417..8659ba76d 100644 --- a/agents/kamagent.go +++ b/agents/kamagent.go @@ -421,6 +421,9 @@ func (ka *KamailioAgent) V1GetActiveSessionIDs(ignParam string, sessionIDs *[]*s return errors.New("timeout executing dialog list") } } + if len(*sessionIDs) == 0 { + return utils.ErrNoActiveSession + } tm.Stop() return } diff --git a/sessions/sessions.go b/sessions/sessions.go index ed818ffed..848e88480 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -1356,7 +1356,7 @@ func (sS *SessionS) syncSessions() { }() select { case err = <-errChan: - if err != nil { + if err != nil && err.Error() != utils.ErrNoActiveSession.Error() { utils.Logger.Warning( fmt.Sprintf("<%s> error <%s> quering session ids", utils.SessionS, err.Error())) }