From a8ad7f786ae44a6c596d9d590651e1dfad79af4d Mon Sep 17 00:00:00 2001 From: Trial97 Date: Mon, 30 Sep 2019 13:26:05 +0300 Subject: [PATCH] Renamed GetConnection to NewConnection --- services/apierv1.go | 12 ++++++------ services/cdrs.go | 20 ++++++++++---------- services/chargers.go | 4 ++-- services/dnsagent.go | 4 ++-- services/ers.go | 4 ++-- services/freeswitchagent.go | 4 ++-- services/resources.go | 4 ++-- services/responders.go | 8 ++++---- services/schedulers.go | 2 +- services/sessions.go | 32 ++++++++++++++++---------------- services/stats.go | 4 ++-- services/suppliers.go | 12 ++++++------ servmanager/servmanager.go | 8 ++++---- 13 files changed, 59 insertions(+), 59 deletions(-) diff --git a/services/apierv1.go b/services/apierv1.go index 116ee3d17..8489ba83b 100644 --- a/services/apierv1.go +++ b/services/apierv1.go @@ -55,21 +55,21 @@ func (api *ApierV1Service) Start(sp servmanager.ServiceProvider, waitCache bool) // create cache connection var cacheSrpc, schedulerSrpc, attributeSrpc rpcclient.RpcClientConnection - if cacheSrpc, err = sp.GetConnection(utils.CacheS, sp.GetConfig().ApierCfg().CachesConns); err != nil { + if cacheSrpc, err = sp.NewConnection(utils.CacheS, sp.GetConfig().ApierCfg().CachesConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s, error: %s", utils.ApierV1, utils.CacheS, err.Error())) return } // create scheduler connection - if schedulerSrpc, err = sp.GetConnection(utils.SchedulerS, sp.GetConfig().ApierCfg().SchedulerConns); err != nil { + if schedulerSrpc, err = sp.NewConnection(utils.SchedulerS, sp.GetConfig().ApierCfg().SchedulerConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s, error: %s", utils.ApierV1, utils.SchedulerS, err.Error())) return } // create scheduler connection - if attributeSrpc, err = sp.GetConnection(utils.AttributeS, sp.GetConfig().ApierCfg().AttributeSConns); err != nil { + if attributeSrpc, err = sp.NewConnection(utils.AttributeS, sp.GetConfig().ApierCfg().AttributeSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s, error: %s", utils.ApierV1, utils.AttributeS, err.Error())) return @@ -142,21 +142,21 @@ func (api *ApierV1Service) GetIntenternalChan() (conn chan rpcclient.RpcClientCo // Reload handles the change of config func (api *ApierV1Service) Reload(sp servmanager.ServiceProvider) (err error) { var cacheSrpc, schedulerSrpc, attributeSrpc rpcclient.RpcClientConnection - if cacheSrpc, err = sp.GetConnection(utils.CacheS, sp.GetConfig().ApierCfg().CachesConns); err != nil { + if cacheSrpc, err = sp.NewConnection(utils.CacheS, sp.GetConfig().ApierCfg().CachesConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s, error: %s", utils.ApierV1, utils.CacheS, err.Error())) return } // create scheduler connection - if schedulerSrpc, err = sp.GetConnection(utils.SchedulerS, sp.GetConfig().ApierCfg().SchedulerConns); err != nil { + if schedulerSrpc, err = sp.NewConnection(utils.SchedulerS, sp.GetConfig().ApierCfg().SchedulerConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s, error: %s", utils.ApierV1, utils.SchedulerS, err.Error())) return } // create scheduler connection - if attributeSrpc, err = sp.GetConnection(utils.AttributeS, sp.GetConfig().ApierCfg().AttributeSConns); err != nil { + if attributeSrpc, err = sp.NewConnection(utils.AttributeS, sp.GetConfig().ApierCfg().AttributeSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s, error: %s", utils.ApierV1, utils.AttributeS, err.Error())) return diff --git a/services/cdrs.go b/services/cdrs.go index 51f9af26e..f20ea23db 100644 --- a/services/cdrs.go +++ b/services/cdrs.go @@ -56,31 +56,31 @@ func (cdrS *CDRServer) Start(sp servmanager.ServiceProvider, waitCache bool) (er var ralConn, attrSConn, thresholdSConn, statsConn, chargerSConn rpcclient.RpcClientConnection - chargerSConn, err = sp.GetConnection(utils.ChargerS, sp.GetConfig().CdrsCfg().ChargerSConns) + chargerSConn, err = sp.NewConnection(utils.ChargerS, sp.GetConfig().CdrsCfg().ChargerSConns) if err != nil { utils.Logger.Crit(fmt.Sprintf(" Could not connect to %s: %s", utils.ChargerS, err.Error())) return } - ralConn, err = sp.GetConnection(utils.ResponderS, sp.GetConfig().CdrsCfg().RaterConns) + ralConn, err = sp.NewConnection(utils.ResponderS, sp.GetConfig().CdrsCfg().RaterConns) if err != nil { utils.Logger.Crit(fmt.Sprintf(" Could not connect to %s: %s", utils.RALService, err.Error())) return } - attrSConn, err = sp.GetConnection(utils.AttributeS, sp.GetConfig().CdrsCfg().AttributeSConns) + attrSConn, err = sp.NewConnection(utils.AttributeS, sp.GetConfig().CdrsCfg().AttributeSConns) if err != nil { utils.Logger.Crit(fmt.Sprintf(" Could not connect to %s: %s", utils.AttributeS, err.Error())) return } - thresholdSConn, err = sp.GetConnection(utils.ThresholdS, sp.GetConfig().CdrsCfg().ThresholdSConns) + thresholdSConn, err = sp.NewConnection(utils.ThresholdS, sp.GetConfig().CdrsCfg().ThresholdSConns) if err != nil { utils.Logger.Crit(fmt.Sprintf(" Could not connect to %s: %s", utils.ThresholdS, err.Error())) return } - statsConn, err = sp.GetConnection(utils.StatS, sp.GetConfig().CdrsCfg().StatSConns) + statsConn, err = sp.NewConnection(utils.StatS, sp.GetConfig().CdrsCfg().StatSConns) if err != nil { utils.Logger.Crit(fmt.Sprintf(" Could not connect to %s: %s", utils.StatS, err.Error())) @@ -113,31 +113,31 @@ func (cdrS *CDRServer) GetIntenternalChan() (conn chan rpcclient.RpcClientConnec func (cdrS *CDRServer) Reload(sp servmanager.ServiceProvider) (err error) { var ralConn, attrSConn, thresholdSConn, statsConn, chargerSConn rpcclient.RpcClientConnection - chargerSConn, err = sp.GetConnection(utils.ChargerS, sp.GetConfig().CdrsCfg().ChargerSConns) + chargerSConn, err = sp.NewConnection(utils.ChargerS, sp.GetConfig().CdrsCfg().ChargerSConns) if err != nil { utils.Logger.Crit(fmt.Sprintf(" Could not connect to %s: %s", utils.ChargerS, err.Error())) return } - ralConn, err = sp.GetConnection(utils.ResponderS, sp.GetConfig().CdrsCfg().RaterConns) + ralConn, err = sp.NewConnection(utils.ResponderS, sp.GetConfig().CdrsCfg().RaterConns) if err != nil { utils.Logger.Crit(fmt.Sprintf(" Could not connect to %s: %s", utils.RALService, err.Error())) return } - attrSConn, err = sp.GetConnection(utils.AttributeS, sp.GetConfig().CdrsCfg().AttributeSConns) + attrSConn, err = sp.NewConnection(utils.AttributeS, sp.GetConfig().CdrsCfg().AttributeSConns) if err != nil { utils.Logger.Crit(fmt.Sprintf(" Could not connect to %s: %s", utils.AttributeS, err.Error())) return } - thresholdSConn, err = sp.GetConnection(utils.ThresholdS, sp.GetConfig().CdrsCfg().ThresholdSConns) + thresholdSConn, err = sp.NewConnection(utils.ThresholdS, sp.GetConfig().CdrsCfg().ThresholdSConns) if err != nil { utils.Logger.Crit(fmt.Sprintf(" Could not connect to %s: %s", utils.ThresholdS, err.Error())) return } - statsConn, err = sp.GetConnection(utils.StatS, sp.GetConfig().CdrsCfg().StatSConns) + statsConn, err = sp.NewConnection(utils.StatS, sp.GetConfig().CdrsCfg().StatSConns) if err != nil { utils.Logger.Crit(fmt.Sprintf(" Could not connect to %s: %s", utils.StatS, err.Error())) diff --git a/services/chargers.go b/services/chargers.go index 2a8166ea9..0c5335aed 100644 --- a/services/chargers.go +++ b/services/chargers.go @@ -54,7 +54,7 @@ func (chrS *ChargerService) Start(sp servmanager.ServiceProvider, waitCache bool <-sp.GetCacheS().GetPrecacheChannel(utils.CacheChargerFilterIndexes) } var attrSConn rpcclient.RpcClientConnection - if attrSConn, err = sp.GetConnection(utils.AttributeS, sp.GetConfig().ChargerSCfg().AttributeSConns); err != nil { + if attrSConn, err = sp.NewConnection(utils.AttributeS, sp.GetConfig().ChargerSCfg().AttributeSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.ChargerS, utils.AttributeS, err.Error())) return @@ -84,7 +84,7 @@ func (chrS *ChargerService) GetIntenternalChan() (conn chan rpcclient.RpcClientC // Reload handles the change of config func (chrS *ChargerService) Reload(sp servmanager.ServiceProvider) (err error) { var attrSConn rpcclient.RpcClientConnection - if attrSConn, err = sp.GetConnection(utils.AttributeS, sp.GetConfig().ChargerSCfg().AttributeSConns); err != nil { + if attrSConn, err = sp.NewConnection(utils.AttributeS, sp.GetConfig().ChargerSCfg().AttributeSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.ChargerS, utils.AttributeS, err.Error())) return diff --git a/services/dnsagent.go b/services/dnsagent.go index 004410135..a4d8e2711 100644 --- a/services/dnsagent.go +++ b/services/dnsagent.go @@ -63,7 +63,7 @@ func (dns *DNSAgent) Start(sp servmanager.ServiceProvider, waitCache bool) (err srvSessionS.GetIntenternalChan() <- sSIntConn sS = utils.NewBiRPCInternalClient(sSIntConn.(*sessions.SessionS)) } else { - if sS, err = sp.GetConnection(utils.SessionS, sp.GetConfig().DNSAgentCfg().SessionSConns); err != nil { + if sS, err = sp.NewConnection(utils.SessionS, sp.GetConfig().DNSAgentCfg().SessionSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.DNSAgent, utils.SessionS, err.Error())) return @@ -115,7 +115,7 @@ func (dns *DNSAgent) Reload(sp servmanager.ServiceProvider) (err error) { srvSessionS.GetIntenternalChan() <- sSIntConn sS = utils.NewBiRPCInternalClient(sSIntConn.(*sessions.SessionS)) } else { - if sS, err = sp.GetConnection(utils.SessionS, sp.GetConfig().DNSAgentCfg().SessionSConns); err != nil { + if sS, err = sp.NewConnection(utils.SessionS, sp.GetConfig().DNSAgentCfg().SessionSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.DNSAgent, utils.SessionS, err.Error())) return diff --git a/services/ers.go b/services/ers.go index 9c2c00434..7b77ff119 100644 --- a/services/ers.go +++ b/services/ers.go @@ -57,7 +57,7 @@ func (erS *EventReaderService) Start(sp servmanager.ServiceProvider, waitCache b utils.Logger.Info(fmt.Sprintf("<%s> starting <%s> subsystem", utils.CoreS, utils.ERs)) var sS rpcclient.RpcClientConnection - if sS, err = sp.GetConnection(utils.SessionS, sp.GetConfig().ERsCfg().SessionSConns); err != nil { + if sS, err = sp.NewConnection(utils.SessionS, sp.GetConfig().ERsCfg().SessionSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> failed connecting to <%s>, error: <%s>", utils.ERs, utils.SessionS, err.Error())) return @@ -81,7 +81,7 @@ func (erS *EventReaderService) GetIntenternalChan() (conn chan rpcclient.RpcClie // Reload handles the change of config func (erS *EventReaderService) Reload(sp servmanager.ServiceProvider) (err error) { var sS rpcclient.RpcClientConnection - if sS, err = sp.GetConnection(utils.SessionS, sp.GetConfig().ERsCfg().SessionSConns); err != nil { + if sS, err = sp.NewConnection(utils.SessionS, sp.GetConfig().ERsCfg().SessionSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> failed connecting to <%s>, error: <%s>", utils.ERs, utils.SessionS, err.Error())) return diff --git a/services/freeswitchagent.go b/services/freeswitchagent.go index fcbd9bb39..099d219de 100644 --- a/services/freeswitchagent.go +++ b/services/freeswitchagent.go @@ -63,7 +63,7 @@ func (fS *FreeswitchAgent) Start(sp servmanager.ServiceProvider, waitCache bool) srvSessionS.GetIntenternalChan() <- sSIntConn sS = utils.NewBiRPCInternalClient(sSIntConn.(*sessions.SessionS)) } else { - if sS, err = sp.GetConnection(utils.SessionS, sp.GetConfig().FsAgentCfg().SessionSConns); err != nil { + if sS, err = sp.NewConnection(utils.SessionS, sp.GetConfig().FsAgentCfg().SessionSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.FreeSWITCHAgent, utils.SessionS, err.Error())) return @@ -112,7 +112,7 @@ func (fS *FreeswitchAgent) Reload(sp servmanager.ServiceProvider) (err error) { srvSessionS.GetIntenternalChan() <- sSIntConn sS = utils.NewBiRPCInternalClient(sSIntConn.(*sessions.SessionS)) } else { - if sS, err = sp.GetConnection(utils.SessionS, sp.GetConfig().FsAgentCfg().SessionSConns); err != nil { + if sS, err = sp.NewConnection(utils.SessionS, sp.GetConfig().FsAgentCfg().SessionSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.FreeSWITCHAgent, utils.SessionS, err.Error())) return diff --git a/services/resources.go b/services/resources.go index f11f34fc8..d983e32b5 100644 --- a/services/resources.go +++ b/services/resources.go @@ -55,7 +55,7 @@ func (reS *ResourceService) Start(sp servmanager.ServiceProvider, waitCache bool <-sp.GetCacheS().GetPrecacheChannel(utils.CacheResourceFilterIndexes) } var thdSConn rpcclient.RpcClientConnection - if thdSConn, err = sp.GetConnection(utils.ThresholdS, sp.GetConfig().ResourceSCfg().ThresholdSConns); err != nil { + if thdSConn, err = sp.NewConnection(utils.ThresholdS, sp.GetConfig().ResourceSCfg().ThresholdSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to ThresholdS: %s", utils.ResourceS, err.Error())) return } @@ -85,7 +85,7 @@ func (reS *ResourceService) GetIntenternalChan() (conn chan rpcclient.RpcClientC // Reload handles the change of config func (reS *ResourceService) Reload(sp servmanager.ServiceProvider) (err error) { var thdSConn rpcclient.RpcClientConnection - if thdSConn, err = sp.GetConnection(utils.ThresholdS, sp.GetConfig().ResourceSCfg().ThresholdSConns); err != nil { + if thdSConn, err = sp.NewConnection(utils.ThresholdS, sp.GetConfig().ResourceSCfg().ThresholdSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to ThresholdS: %s", utils.ResourceS, err.Error())) return } diff --git a/services/responders.go b/services/responders.go index 3d5329cec..4d37d917e 100644 --- a/services/responders.go +++ b/services/responders.go @@ -50,12 +50,12 @@ func (resp *ResponderService) Start(sp servmanager.ServiceProvider, waitCache bo } var thdS, stats rpcclient.RpcClientConnection - if thdS, err = sp.GetConnection(utils.ThresholdS, sp.GetConfig().RalsCfg().ThresholdSConns); err != nil { + if thdS, err = sp.NewConnection(utils.ThresholdS, sp.GetConfig().RalsCfg().ThresholdSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s, error: %s", utils.RALService, utils.ThresholdS, err.Error())) return } - if stats, err = sp.GetConnection(utils.StatS, sp.GetConfig().RalsCfg().StatSConns); err != nil { + if stats, err = sp.NewConnection(utils.StatS, sp.GetConfig().RalsCfg().StatSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s, error: %s", utils.RALService, utils.StatS, err.Error())) return @@ -91,12 +91,12 @@ func (resp *ResponderService) GetIntenternalChan() (conn chan rpcclient.RpcClien // Reload handles the change of config func (resp *ResponderService) Reload(sp servmanager.ServiceProvider) (err error) { var thdS, stats rpcclient.RpcClientConnection - if thdS, err = sp.GetConnection(utils.ThresholdS, sp.GetConfig().RalsCfg().ThresholdSConns); err != nil { + if thdS, err = sp.NewConnection(utils.ThresholdS, sp.GetConfig().RalsCfg().ThresholdSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s, error: %s", utils.RALService, utils.ThresholdS, err.Error())) return } - if stats, err = sp.GetConnection(utils.StatS, sp.GetConfig().RalsCfg().StatSConns); err != nil { + if stats, err = sp.NewConnection(utils.StatS, sp.GetConfig().RalsCfg().StatSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s, error: %s", utils.RALService, utils.StatS, err.Error())) return diff --git a/services/schedulers.go b/services/schedulers.go index 98ba96bb1..9bf81a71a 100644 --- a/services/schedulers.go +++ b/services/schedulers.go @@ -69,7 +69,7 @@ func (schS *SchedulerService) Start(sp servmanager.ServiceProvider, waitCache bo schS.connChan <- schS.rpc // Create connection to CDR Server and share it in engine(used for *cdrlog action) - cdrsConn, err := sp.GetConnection(utils.CDRServer, sp.GetConfig().SchedulerCfg().CDRsConns) + cdrsConn, err := sp.NewConnection(utils.CDRServer, sp.GetConfig().SchedulerCfg().CDRsConns) if err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to CDRServer: %s", utils.SchedulerS, err.Error())) return diff --git a/services/sessions.go b/services/sessions.go index 3c4612502..5c44675f2 100644 --- a/services/sessions.go +++ b/services/sessions.go @@ -59,49 +59,49 @@ func (smg *SessionService) Start(sp servmanager.ServiceProvider, waitCache bool) defer smg.Unlock() var ralsConns, resSConns, threshSConns, statSConns, suplSConns, attrConns, cdrsConn, chargerSConn rpcclient.RpcClientConnection - if chargerSConn, err = sp.GetConnection(utils.ChargerS, sp.GetConfig().SessionSCfg().ChargerSConns); err != nil { + if chargerSConn, err = sp.NewConnection(utils.ChargerS, sp.GetConfig().SessionSCfg().ChargerSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.ChargerS, err.Error())) return } - if ralsConns, err = sp.GetConnection(utils.ResponderS, sp.GetConfig().SessionSCfg().RALsConns); err != nil { + if ralsConns, err = sp.NewConnection(utils.ResponderS, sp.GetConfig().SessionSCfg().RALsConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.ResponderS, err.Error())) return } - if resSConns, err = sp.GetConnection(utils.ResourceS, sp.GetConfig().SessionSCfg().ResSConns); err != nil { + if resSConns, err = sp.NewConnection(utils.ResourceS, sp.GetConfig().SessionSCfg().ResSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.ResourceS, err.Error())) return } - if threshSConns, err = sp.GetConnection(utils.ThresholdS, sp.GetConfig().SessionSCfg().ThreshSConns); err != nil { + if threshSConns, err = sp.NewConnection(utils.ThresholdS, sp.GetConfig().SessionSCfg().ThreshSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.ThresholdS, err.Error())) return } - if statSConns, err = sp.GetConnection(utils.StatS, sp.GetConfig().SessionSCfg().StatSConns); err != nil { + if statSConns, err = sp.NewConnection(utils.StatS, sp.GetConfig().SessionSCfg().StatSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.StatS, err.Error())) return } - if suplSConns, err = sp.GetConnection(utils.SupplierS, sp.GetConfig().SessionSCfg().SupplSConns); err != nil { + if suplSConns, err = sp.NewConnection(utils.SupplierS, sp.GetConfig().SessionSCfg().SupplSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.SupplierS, err.Error())) return } - if attrConns, err = sp.GetConnection(utils.AttributeS, sp.GetConfig().SessionSCfg().AttrSConns); err != nil { + if attrConns, err = sp.NewConnection(utils.AttributeS, sp.GetConfig().SessionSCfg().AttrSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.AttributeS, err.Error())) return } - if cdrsConn, err = sp.GetConnection(utils.CDRServer, sp.GetConfig().SessionSCfg().CDRsConns); err != nil { + if cdrsConn, err = sp.NewConnection(utils.CDRServer, sp.GetConfig().SessionSCfg().CDRsConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.CDRServer, err.Error())) return @@ -167,49 +167,49 @@ func (smg *SessionService) GetIntenternalChan() (conn chan rpcclient.RpcClientCo func (smg *SessionService) Reload(sp servmanager.ServiceProvider) (err error) { var ralsConns, resSConns, threshSConns, statSConns, suplSConns, attrConns, cdrsConn, chargerSConn rpcclient.RpcClientConnection - if chargerSConn, err = sp.GetConnection(utils.ChargerS, sp.GetConfig().SessionSCfg().ChargerSConns); err != nil { + if chargerSConn, err = sp.NewConnection(utils.ChargerS, sp.GetConfig().SessionSCfg().ChargerSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.ChargerS, err.Error())) return } - if ralsConns, err = sp.GetConnection(utils.ResponderS, sp.GetConfig().SessionSCfg().RALsConns); err != nil { + if ralsConns, err = sp.NewConnection(utils.ResponderS, sp.GetConfig().SessionSCfg().RALsConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.ResponderS, err.Error())) return } - if resSConns, err = sp.GetConnection(utils.ResourceS, sp.GetConfig().SessionSCfg().ResSConns); err != nil { + if resSConns, err = sp.NewConnection(utils.ResourceS, sp.GetConfig().SessionSCfg().ResSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.ResourceS, err.Error())) return } - if threshSConns, err = sp.GetConnection(utils.ThresholdS, sp.GetConfig().SessionSCfg().ThreshSConns); err != nil { + if threshSConns, err = sp.NewConnection(utils.ThresholdS, sp.GetConfig().SessionSCfg().ThreshSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.ThresholdS, err.Error())) return } - if statSConns, err = sp.GetConnection(utils.StatS, sp.GetConfig().SessionSCfg().StatSConns); err != nil { + if statSConns, err = sp.NewConnection(utils.StatS, sp.GetConfig().SessionSCfg().StatSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.StatS, err.Error())) return } - if suplSConns, err = sp.GetConnection(utils.SupplierS, sp.GetConfig().SessionSCfg().SupplSConns); err != nil { + if suplSConns, err = sp.NewConnection(utils.SupplierS, sp.GetConfig().SessionSCfg().SupplSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.SupplierS, err.Error())) return } - if attrConns, err = sp.GetConnection(utils.AttributeS, sp.GetConfig().SessionSCfg().AttrSConns); err != nil { + if attrConns, err = sp.NewConnection(utils.AttributeS, sp.GetConfig().SessionSCfg().AttrSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.AttributeS, err.Error())) return } - if cdrsConn, err = sp.GetConnection(utils.CDRServer, sp.GetConfig().SessionSCfg().CDRsConns); err != nil { + if cdrsConn, err = sp.NewConnection(utils.CDRServer, sp.GetConfig().SessionSCfg().CDRsConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SessionS, utils.CDRServer, err.Error())) return diff --git a/services/stats.go b/services/stats.go index fd8e3fef9..34b45a0bf 100644 --- a/services/stats.go +++ b/services/stats.go @@ -56,7 +56,7 @@ func (sts *StatService) Start(sp servmanager.ServiceProvider, waitCache bool) (e } var thdSConn rpcclient.RpcClientConnection - if thdSConn, err = sp.GetConnection(utils.ThresholdS, sp.GetConfig().StatSCfg().ThresholdSConns); err != nil { + if thdSConn, err = sp.NewConnection(utils.ThresholdS, sp.GetConfig().StatSCfg().ThresholdSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to ThresholdS: %s", utils.StatS, err.Error())) return } @@ -85,7 +85,7 @@ func (sts *StatService) GetIntenternalChan() (conn chan rpcclient.RpcClientConne // Reload handles the change of config func (sts *StatService) Reload(sp servmanager.ServiceProvider) (err error) { var thdSConn rpcclient.RpcClientConnection - if thdSConn, err = sp.GetConnection(utils.ThresholdS, sp.GetConfig().StatSCfg().ThresholdSConns); err != nil { + if thdSConn, err = sp.NewConnection(utils.ThresholdS, sp.GetConfig().StatSCfg().ThresholdSConns); err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to ThresholdS: %s", utils.StatS, err.Error())) return } diff --git a/services/suppliers.go b/services/suppliers.go index c3e2e912b..f1b6a4f04 100644 --- a/services/suppliers.go +++ b/services/suppliers.go @@ -56,19 +56,19 @@ func (splS *SupplierService) Start(sp servmanager.ServiceProvider, waitCache boo } var attrSConn, resourceSConn, statSConn rpcclient.RpcClientConnection - attrSConn, err = sp.GetConnection(utils.AttributeS, sp.GetConfig().SupplierSCfg().AttributeSConns) + attrSConn, err = sp.NewConnection(utils.AttributeS, sp.GetConfig().SupplierSCfg().AttributeSConns) if err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SupplierS, utils.SupplierS, err.Error())) return } - statSConn, err = sp.GetConnection(utils.StatS, sp.GetConfig().SupplierSCfg().StatSConns) + statSConn, err = sp.NewConnection(utils.StatS, sp.GetConfig().SupplierSCfg().StatSConns) if err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to StatS: %s", utils.SupplierS, err.Error())) return } - resourceSConn, err = sp.GetConnection(utils.ResourceS, sp.GetConfig().SupplierSCfg().ResourceSConns) + resourceSConn, err = sp.NewConnection(utils.ResourceS, sp.GetConfig().SupplierSCfg().ResourceSConns) if err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to StatS: %s", utils.SupplierS, err.Error())) @@ -101,19 +101,19 @@ func (splS *SupplierService) GetIntenternalChan() (conn chan rpcclient.RpcClient // Reload handles the change of config func (splS *SupplierService) Reload(sp servmanager.ServiceProvider) (err error) { var attrSConn, resourceSConn, statSConn rpcclient.RpcClientConnection - attrSConn, err = sp.GetConnection(utils.AttributeS, sp.GetConfig().SupplierSCfg().AttributeSConns) + attrSConn, err = sp.NewConnection(utils.AttributeS, sp.GetConfig().SupplierSCfg().AttributeSConns) if err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s", utils.SupplierS, utils.SupplierS, err.Error())) return } - statSConn, err = sp.GetConnection(utils.StatS, sp.GetConfig().SupplierSCfg().StatSConns) + statSConn, err = sp.NewConnection(utils.StatS, sp.GetConfig().SupplierSCfg().StatSConns) if err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to StatS: %s", utils.SupplierS, err.Error())) return } - resourceSConn, err = sp.GetConnection(utils.ResourceS, sp.GetConfig().SupplierSCfg().ResourceSConns) + resourceSConn, err = sp.NewConnection(utils.ResourceS, sp.GetConfig().SupplierSCfg().ResourceSConns) if err != nil { utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to StatS: %s", utils.SupplierS, err.Error())) diff --git a/servmanager/servmanager.go b/servmanager/servmanager.go index 30a01a1d0..c0232014a 100644 --- a/servmanager/servmanager.go +++ b/servmanager/servmanager.go @@ -212,8 +212,8 @@ func (srvMngr *ServiceManager) GetExitChan() chan bool { return srvMngr.engineShutdown } -// GetConnection creates a rpcClient to the specified subsystem -func (srvMngr *ServiceManager) GetConnection(subsystem string, conns []*config.RemoteHost) (rpcclient.RpcClientConnection, error) { +// NewConnection creates a rpcClient to the specified subsystem +func (srvMngr *ServiceManager) NewConnection(subsystem string, conns []*config.RemoteHost) (rpcclient.RpcClientConnection, error) { if len(conns) == 0 { return nil, nil } @@ -454,8 +454,8 @@ type ServiceProvider interface { GetServer() *utils.Server // GetExitChan returns the exit chanel GetExitChan() chan bool - // GetConnection creates a rpcClient to the specified subsystem - GetConnection(subsystem string, cfg []*config.RemoteHost) (rpcclient.RpcClientConnection, error) + // NewConnection creates a rpcClient to the specified subsystem + NewConnection(subsystem string, cfg []*config.RemoteHost) (rpcclient.RpcClientConnection, error) // GetService returns the named service GetService(subsystem string) (Service, bool) // AddService adds the given serices