uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Update agents to take into consideration the latest versions of the agent libraries

Browse Source
This commit is contained in:
ionutboangiu
2022-05-25 16:51:59 +03:00
committed by Dan Christian Bogos
parent 31c0e784b7
commit 27912d1223
3 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
agents/astagent.go
View File

@@ -83,14 +83,10 @@ func (sma *AsteriskAgent) connectAsterisk(stopChan <-chan struct{}) (err error)
connCfg := sma.cgrCfg.AsteriskAgentCfg().AsteriskConns[sma.astConnIdx]
sma.astEvChan = make(chan map[string]interface{})
sma.astErrChan = make(chan error)
var maxReconnectInterval time.Duration
if maxReconnectInterval, err = utils.ParseDurationWithNanosecs(connCfg.MaxReconnectInterval); err != nil {
return
}
sma.astConn, err = aringo.NewARInGO(fmt.Sprintf("ws://%s/ari/events?api_key=%s:%s&app=%s",
connCfg.Address, connCfg.User, connCfg.Password, CGRAuthAPP), "http://cgrates.org",
connCfg.User, connCfg.Password, fmt.Sprintf("%s@%s", utils.CGRateS, utils.Version),
sma.astEvChan, sma.astErrChan, stopChan, connCfg.ConnectAttempts, connCfg.Reconnects, maxReconnectInterval)
sma.astEvChan, sma.astErrChan, stopChan, connCfg.ConnectAttempts, connCfg.Reconnects, connCfg.MaxReconnectInterval, utils.FibDuration)
return
}

15
agents/fsagent.go
View File

@@ -288,12 +288,8 @@ func (fsa *FSsessions) Connect() error {
eventFilters := map[string][]string{"Call-Direction": {"inbound"}}
errChan := make(chan error)
for connIdx, connCfg := range fsa.cfg.EventSocketConns {
maxReconnectInterval, err := utils.ParseDurationWithNanosecs(connCfg.MaxReconnectInterval)
if err != nil {
return err
}
fSock, err := fsock.NewFSock(connCfg.Address, connCfg.Password, connCfg.Reconnects, maxReconnectInterval,
fsa.createHandlers(), eventFilters, utils.Logger.GetSyslog(), connIdx)
fSock, err := fsock.NewFSock(connCfg.Address, connCfg.Password, connCfg.Reconnects, connCfg.MaxReconnectInterval, utils.FibDuration,
fsa.createHandlers(), eventFilters, utils.Logger.GetSyslog(), connIdx, true)
if err != nil {
return err
}
@@ -307,11 +303,8 @@ func (fsa *FSsessions) Connect() error {
errChan <- err
}
}(fSock)
fsSenderPool, err := fsock.NewFSockPool(5, connCfg.Address, connCfg.Password, 1, fsa.cfg.MaxWaitConnection,
make(map[string][]func(string, int)), make(map[string][]string), utils.Logger.GetSyslog(), connIdx)
if err != nil {
return fmt.Errorf("Cannot connect FreeSWITCH senders pool, error: %s", err.Error())
}
fsSenderPool := fsock.NewFSockPool(5, connCfg.Address, connCfg.Password, 1, fsa.cfg.MaxWaitConnection,
0, utils.FibDuration, make(map[string][]func(string, int)), make(map[string][]string), utils.Logger.GetSyslog(), connIdx, true)
if fsSenderPool == nil {
return errors.New("Cannot connect FreeSWITCH senders pool")
}

8
agents/kamagent.go
View File

@@ -77,12 +77,8 @@ func (self *KamailioAgent) Connect() (err error) {
errChan := make(chan error)
for connIdx, connCfg := range self.cfg.EvapiConns {
logger := log.New(utils.Logger, "kamevapi:", 2)
var maxReconnectInterval time.Duration
if maxReconnectInterval, err = utils.ParseDurationWithNanosecs(connCfg.MaxReconnectInterval); err != nil {
return
}
if self.conns[connIdx], err = kamevapi.NewKamEvapi(connCfg.Address, connIdx, connCfg.Reconnects, maxReconnectInterval,
eventHandlers, logger); err != nil {
if self.conns[connIdx], err = kamevapi.NewKamEvapi(connCfg.Address, connIdx, connCfg.Reconnects, connCfg.MaxReconnectInterval,
utils.FibDuration, eventHandlers, logger); err != nil {
return
}
utils.Logger.Info(fmt.Sprintf("<%s> successfully connected to Kamailio at: <%s>", utils.KamailioAgent, connCfg.Address))