diff --git a/apier/v1/dm_remote_it_test.go b/apier/v1/dm_remote_it_test.go
index d849f5e40..6a8ac481f 100644
--- a/apier/v1/dm_remote_it_test.go
+++ b/apier/v1/dm_remote_it_test.go
@@ -777,9 +777,9 @@ func testInternalAccountBalanceOperations(t *testing.T) {
Tenant: "cgrates.org",
Account: "testAccount1",
BalanceType: utils.MONETARY,
- Value: 17.4,
+ Value: 17.4,
Balance: map[string]interface{}{
- utils.ID: "testAccSetBalance",
+ utils.ID: "testAccSetBalance",
},
}
if err := internalRPC.Call(utils.ApierV1SetBalance, attrs, &reply); err != nil {
diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go
index 3d7126ef8..6bacdfebd 100644
--- a/cmd/cgr-engine/cgr-engine.go
+++ b/cmd/cgr-engine/cgr-engine.go
@@ -466,7 +466,7 @@ func main() {
// initialize the connManager before creating the DMService
// because we need to pass the connection to it
- connManager := services.NewConnManagerService(cfg, map[string]chan rpcclient.ClientConnector{
+ connManager := engine.NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{
utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAnalyzer): internalAnalyzerSChan,
utils.ConcatenatedKey(utils.MetaInternal, utils.MetaApier): internalAPIerV1Chan,
utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes): internalAttributeSChan,
@@ -489,7 +489,7 @@ func main() {
utils.ConcatenatedKey(utils.MetaInternal, utils.MetaDispatchers): internalDispatcherSChan,
})
- dmService := services.NewDataDBService(cfg, connManager.GetConnMgr())
+ dmService := services.NewDataDBService(cfg, connManager)
storDBService := services.NewStorDBService(cfg)
if dmService.ShouldRun() { // Some services can run without db, ie: CDRC
if err = dmService.Start(); err != nil {
@@ -526,45 +526,44 @@ func main() {
// Start ServiceManager
srvManager := servmanager.NewServiceManager(cfg, exitChan)
-
attrS := services.NewAttributeService(cfg, dmService, cacheS, filterSChan, server, internalAttributeSChan)
- dspS := services.NewDispatcherService(cfg, dmService, cacheS, filterSChan, server, internalDispatcherSChan, connManager.GetConnMgr())
+ dspS := services.NewDispatcherService(cfg, dmService, cacheS, filterSChan, server, internalDispatcherSChan, connManager)
chrS := services.NewChargerService(cfg, dmService, cacheS, filterSChan, server,
- internalChargerSChan, connManager.GetConnMgr())
+ internalChargerSChan, connManager)
tS := services.NewThresholdService(cfg, dmService, cacheS, filterSChan, server, internalThresholdSChan)
stS := services.NewStatService(cfg, dmService, cacheS, filterSChan, server,
- internalStatSChan, connManager.GetConnMgr())
+ internalStatSChan, connManager)
reS := services.NewResourceService(cfg, dmService, cacheS, filterSChan, server,
- internalResourceSChan, connManager.GetConnMgr())
+ internalResourceSChan, connManager)
supS := services.NewSupplierService(cfg, dmService, cacheS, filterSChan, server,
- internalSupplierSChan, connManager.GetConnMgr())
+ internalSupplierSChan, connManager)
schS := services.NewSchedulerService(cfg, dmService, cacheS, filterSChan,
- server, internalSchedulerSChan, connManager.GetConnMgr())
+ server, internalSchedulerSChan, connManager)
rals := services.NewRalService(cfg, dmService, storDBService, cacheS, filterSChan, server,
internalRALsChan, internalResponderChan, internalAPIerV1Chan, internalAPIerV2Chan,
- schS, exitChan, connManager.GetConnMgr())
+ schS, exitChan, connManager)
cdrS := services.NewCDRServer(cfg, dmService, storDBService, filterSChan, server, internalCDRServerChan,
- connManager.GetConnMgr())
+ connManager)
- smg := services.NewSessionService(cfg, dmService, server, internalSessionSChan, exitChan, connManager.GetConnMgr())
+ smg := services.NewSessionService(cfg, dmService, server, internalSessionSChan, exitChan, connManager)
ldrs := services.NewLoaderService(cfg, dmService, filterSChan, server, exitChan,
- internalLoaderSChan, connManager.GetConnMgr())
+ internalLoaderSChan, connManager)
anz := services.NewAnalyzerService(cfg, server, exitChan, internalAnalyzerSChan)
- srvManager.AddServices(connManager, attrS, chrS, tS, stS, reS, supS, schS, rals,
+ srvManager.AddServices(attrS, chrS, tS, stS, reS, supS, schS, rals,
rals.GetResponder(), rals.GetAPIv1(), rals.GetAPIv2(), cdrS, smg,
- services.NewEventReaderService(cfg, filterSChan, exitChan, connManager.GetConnMgr()),
- services.NewDNSAgent(cfg, filterSChan, exitChan, connManager.GetConnMgr()),
- services.NewFreeswitchAgent(cfg, exitChan, connManager.GetConnMgr()),
- services.NewKamailioAgent(cfg, exitChan, connManager.GetConnMgr()),
- services.NewAsteriskAgent(cfg, exitChan, connManager.GetConnMgr()), // partial reload
- services.NewRadiusAgent(cfg, filterSChan, exitChan, connManager.GetConnMgr()), // partial reload
- services.NewDiameterAgent(cfg, filterSChan, exitChan, connManager.GetConnMgr()), // partial reload
- services.NewHTTPAgent(cfg, filterSChan, server, connManager.GetConnMgr()), // no reload
+ services.NewEventReaderService(cfg, filterSChan, exitChan, connManager),
+ services.NewDNSAgent(cfg, filterSChan, exitChan, connManager),
+ services.NewFreeswitchAgent(cfg, exitChan, connManager),
+ services.NewKamailioAgent(cfg, exitChan, connManager),
+ services.NewAsteriskAgent(cfg, exitChan, connManager), // partial reload
+ services.NewRadiusAgent(cfg, filterSChan, exitChan, connManager), // partial reload
+ services.NewDiameterAgent(cfg, filterSChan, exitChan, connManager), // partial reload
+ services.NewHTTPAgent(cfg, filterSChan, server, connManager), // no reload
ldrs, anz, dspS, dmService, storDBService,
)
srvManager.StartServices()
@@ -604,7 +603,7 @@ func main() {
initConfigSv1(internalConfigChan, server)
// Start CDRC components if necessary
- go startCdrcs(filterSChan, exitChan, connManager.GetConnMgr())
+ go startCdrcs(filterSChan, exitChan, connManager)
// Serve rpc connections
go startRpc(server, rals.GetResponder().GetIntenternalChan(), cdrS.GetIntenternalChan(),
diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go
index 90948ef68..5a2ee5c16 100755
--- a/cmd/cgr-loader/cgr-loader.go
+++ b/cmd/cgr-loader/cgr-loader.go
@@ -112,8 +112,6 @@ func loadConfig() (ldrCfg *config.CGRConfig) {
}
config.SetCgrConfig(ldrCfg)
}
- // we initialize connManager here with nil for InternalChannels
- cM := engine.NewConnManager(ldrCfg, nil)
// Data for DataDB
if *dataDBType != dfltCfg.DataDbCfg().DataDbType {
ldrCfg.DataDbCfg().DataDbType = strings.TrimPrefix(*dataDBType, "*")
@@ -246,6 +244,8 @@ func main() {
}
ldrCfg := loadConfig()
+ // we initialize connManager here with nil for InternalChannels
+ cM := engine.NewConnManager(ldrCfg, nil)
if !*toStorDB {
d, err := engine.NewDataDBConn(ldrCfg.DataDbCfg().DataDbType,
diff --git a/config/config.go b/config/config.go
index 95e7d7c85..76ae2639a 100755
--- a/config/config.go
+++ b/config/config.go
@@ -1219,6 +1219,11 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
break
}
fallthrough
+ case RPCConnsJsonName: // nothing to reload
+ if !fall {
+ break
+ }
+ fallthrough
case DATADB_JSN:
cfg.rldChans[DATADB_JSN] <- struct{}{}
time.Sleep(1) // to force the context switch( to be sure we start the DB before a service that needs it)
@@ -1436,15 +1441,6 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
time.Sleep(1) // to force the context switch( to be sure we start the DB before a service that needs it)
}
cfg.rldChans[Apier] <- struct{}{}
- if !fall {
- break
- }
- fallthrough
- case RPCConnsJsonName:
- cfg.rldChans[RPCConnsJsonName] <- struct{}{}
- if !fall {
- break
- }
}
return
}
@@ -1775,7 +1771,7 @@ func (*CGRConfig) loadConfigFromReader(rdr io.Reader, loadFuncs []func(jsnCfg *C
// Reads all .json files out of a folder/subfolders and loads them up in lexical order
func (cfg *CGRConfig) loadConfigFromPath(path string, loadFuncs []func(jsnCfg *CgrJsonCfg) error) (err error) {
if isUrl(path) {
- return cfg.loadConfigFromHttp(path, loadFuncs) // prefix protocol
+ return cfg.loadConfigFromHTTP(path, loadFuncs) // prefix protocol
}
var fi os.FileInfo
if fi, err = os.Stat(path); err != nil {
@@ -1831,7 +1827,7 @@ func (cfg *CGRConfig) loadConfigFromFolder(cfgDir string, loadFuncs []func(jsnCf
return
}
-func (cfg *CGRConfig) loadConfigFromHttp(urlPaths string, loadFuncs []func(jsnCfg *CgrJsonCfg) error) (err error) {
+func (cfg *CGRConfig) loadConfigFromHTTP(urlPaths string, loadFuncs []func(jsnCfg *CgrJsonCfg) error) (err error) {
for _, urlPath := range strings.Split(urlPaths, utils.INFIELD_SEP) {
if _, err = url.ParseRequestURI(urlPath); err != nil {
return
diff --git a/engine/cdrs.go b/engine/cdrs.go
index 9251e0f66..556b9e84c 100644
--- a/engine/cdrs.go
+++ b/engine/cdrs.go
@@ -316,7 +316,7 @@ func (cdrS *CDRServer) chrgrSProcessEvent(cgrEv *utils.CGREventWithArgDispatcher
func (cdrS *CDRServer) attrSProcessEvent(cgrEv *utils.CGREventWithArgDispatcher) (err error) {
var rplyEv AttrSProcessEventReply
attrArgs := &AttrArgsProcessEvent{
- Context: utils.StringPointer(utils.FirstNonEmpty(
+ Context: utils.StringPointer(utils.FirstNonEmpty(
utils.IfaceAsString(cgrEv.CGREvent.Event[utils.Context]),
utils.MetaCDRs)),
CGREvent: cgrEv.CGREvent}
diff --git a/services/attributes_it_test.go b/services/attributes_it_test.go
index f528f23a9..db00cf62e 100644
--- a/services/attributes_it_test.go
+++ b/services/attributes_it_test.go
@@ -52,7 +52,8 @@ func TestAttributeSReload(t *testing.T) {
attrS := NewAttributeService(cfg, db,
chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1),
)
- srvMngr.AddServices(NewConnManagerService(cfg, nil), attrS,
+ engine.NewConnManager(cfg, nil)
+ srvMngr.AddServices(attrS,
NewLoaderService(cfg, db, filterSChan, server, engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db)
if err = srvMngr.StartServices(); err != nil {
t.Error(err)
diff --git a/services/cdrs_it_test.go b/services/cdrs_it_test.go
index 18a48dace..99f73e96a 100644
--- a/services/cdrs_it_test.go
+++ b/services/cdrs_it_test.go
@@ -79,7 +79,8 @@ func TestCdrsReload(t *testing.T) {
cdrS := NewCDRServer(cfg, db, stordb, filterSChan, server,
make(chan rpcclient.ClientConnector, 1),
nil)
- srvMngr.AddServices(NewConnManagerService(cfg, nil), cdrS, ralS, schS, chrS,
+ engine.NewConnManager(cfg, nil)
+ srvMngr.AddServices(cdrS, ralS, schS, chrS,
NewLoaderService(cfg, db, filterSChan, server, engineShutdown,
make(chan rpcclient.ClientConnector, 1), nil), db, stordb)
if err = srvMngr.StartServices(); err != nil {
diff --git a/services/chargers_it_test.go b/services/chargers_it_test.go
index a42c8cb67..a04feaf42 100644
--- a/services/chargers_it_test.go
+++ b/services/chargers_it_test.go
@@ -53,7 +53,8 @@ func TestChargerSReload(t *testing.T) {
db := NewDataDBService(cfg, nil)
attrS := NewAttributeService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1))
chrS := NewChargerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil)
- srvMngr.AddServices(NewConnManagerService(cfg, nil), attrS, chrS,
+ engine.NewConnManager(cfg, nil)
+ srvMngr.AddServices(attrS, chrS,
NewLoaderService(cfg, db, filterSChan, server,
engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db)
if err = srvMngr.StartServices(); err != nil {
diff --git a/services/connmanager.go b/services/connmanager.go
deleted file mode 100644
index 1bfa9ea10..000000000
--- a/services/connmanager.go
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
-Copyright (C) ITsysCOM GmbH
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see
-*/
-
-package services
-
-import (
- "sync"
-
- "github.com/cgrates/cgrates/config"
- "github.com/cgrates/cgrates/engine"
- "github.com/cgrates/cgrates/utils"
- "github.com/cgrates/rpcclient"
-)
-
-func NewConnManagerService(cfg *config.CGRConfig, intConns map[string]chan rpcclient.ClientConnector) *ConnManagerService {
- return &ConnManagerService{
- cfg: cfg,
- connMgr: engine.NewConnManager(cfg, intConns),
- }
-}
-
-type ConnManagerService struct {
- sync.RWMutex
- cfg *config.CGRConfig
- connMgr *engine.ConnManager
-}
-
-// Start should handle the sercive start
-func (cM *ConnManagerService) Start() (err error) {
- return
-}
-
-// GetIntenternalChan returns the internal connection chanel
-func (cM *ConnManagerService) GetIntenternalChan() (conn chan rpcclient.ClientConnector) {
- return nil
-}
-
-// Reload handles the change of config
-func (cM *ConnManagerService) Reload() (err error) {
- return // for the momment nothing to reload
-}
-
-// Shutdown stops the service
-func (cM *ConnManagerService) Shutdown() (err error) {
- return
-}
-
-// IsRunning returns if the service is running
-func (cM *ConnManagerService) IsRunning() bool {
- return true
-}
-
-// ServiceName returns the service name
-func (cM *ConnManagerService) ServiceName() string {
- return utils.RPCConnS
-}
-
-// ShouldRun returns if the service should be running
-func (cM *ConnManagerService) ShouldRun() bool {
- return true
-}
-
-func (cM *ConnManagerService) GetConnMgr() *engine.ConnManager {
- return cM.connMgr
-}
diff --git a/services/datadb_it_test.go b/services/datadb_it_test.go
index c1ad50e06..d41da668d 100644
--- a/services/datadb_it_test.go
+++ b/services/datadb_it_test.go
@@ -49,8 +49,9 @@ func TestDataDBReload(t *testing.T) {
close(chS.GetPrecacheChannel(utils.CacheAttributeFilterIndexes))
server := utils.NewServer()
srvMngr := servmanager.NewServiceManager(cfg, engineShutdown)
- db := NewDataDBService(cfg, nil)
- srvMngr.AddServices(NewConnManagerService(cfg, nil), NewAttributeService(cfg, db,
+ cM := engine.NewConnManager(cfg, nil)
+ db := NewDataDBService(cfg, cM)
+ srvMngr.AddServices(NewAttributeService(cfg, db,
chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1)),
NewLoaderService(cfg, db, filterSChan, server, engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db)
if err = srvMngr.StartServices(); err != nil {
diff --git a/services/dispatchers_it_test.go b/services/dispatchers_it_test.go
index 70bb1aa4a..b09fa9545 100644
--- a/services/dispatchers_it_test.go
+++ b/services/dispatchers_it_test.go
@@ -55,7 +55,8 @@ func TestDispatcherSReload(t *testing.T) {
attrS := NewAttributeService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1))
srv := NewDispatcherService(cfg, db, chS, filterSChan, server,
make(chan rpcclient.ClientConnector, 1), nil)
- srvMngr.AddServices(NewConnManagerService(cfg, nil), attrS, srv,
+ engine.NewConnManager(cfg, nil)
+ srvMngr.AddServices(attrS, srv,
NewLoaderService(cfg, db, filterSChan, server,
engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db)
if err = srvMngr.StartServices(); err != nil {
diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go
index 4acaf323e..926293d6d 100644
--- a/services/dnsagent_it_test.go
+++ b/services/dnsagent_it_test.go
@@ -53,7 +53,8 @@ func TestDNSAgentReload(t *testing.T) {
sS := NewSessionService(cfg, db, server, make(chan rpcclient.ClientConnector, 1),
engineShutdown, nil)
srv := NewDNSAgent(cfg, filterSChan, engineShutdown, nil)
- srvMngr.AddServices(NewConnManagerService(cfg, nil), srv, sS,
+ engine.NewConnManager(cfg, nil)
+ srvMngr.AddServices(srv, sS,
NewLoaderService(cfg, db, filterSChan, server, engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db)
if err = srvMngr.StartServices(); err != nil {
t.Fatal(err)
diff --git a/services/ers_it_test.go b/services/ers_it_test.go
index da4b488a1..5fbb69c87 100644
--- a/services/ers_it_test.go
+++ b/services/ers_it_test.go
@@ -57,7 +57,8 @@ func TestEventReaderSReload(t *testing.T) {
db := NewDataDBService(cfg, nil)
sS := NewSessionService(cfg, db, server, make(chan rpcclient.ClientConnector, 1), engineShutdown, nil)
attrS := NewEventReaderService(cfg, filterSChan, engineShutdown, nil)
- srvMngr.AddServices(NewConnManagerService(cfg, nil), attrS, sS,
+ engine.NewConnManager(cfg, nil)
+ srvMngr.AddServices(attrS, sS,
NewLoaderService(cfg, db, filterSChan, server, engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db)
if err = srvMngr.StartServices(); err != nil {
t.Error(err)
diff --git a/services/rals_it_test.go b/services/rals_it_test.go
index 390241327..a767d55cf 100644
--- a/services/rals_it_test.go
+++ b/services/rals_it_test.go
@@ -75,7 +75,8 @@ func TestRalsReload(t *testing.T) {
make(chan rpcclient.ClientConnector, 1),
make(chan rpcclient.ClientConnector, 1),
schS, engineShutdown, nil)
- srvMngr.AddServices(NewConnManagerService(cfg, nil), ralS, schS, tS,
+ engine.NewConnManager(cfg, nil)
+ srvMngr.AddServices(ralS, schS, tS,
NewLoaderService(cfg, db, filterSChan, server, engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db, stordb)
if err = srvMngr.StartServices(); err != nil {
t.Error(err)
diff --git a/services/resources_it_test.go b/services/resources_it_test.go
index 2bb0e37ca..4adff2821 100644
--- a/services/resources_it_test.go
+++ b/services/resources_it_test.go
@@ -56,7 +56,8 @@ func TestResourceSReload(t *testing.T) {
db := NewDataDBService(cfg, nil)
tS := NewThresholdService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1))
reS := NewResourceService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil)
- srvMngr.AddServices(NewConnManagerService(cfg, nil), tS, reS,
+ engine.NewConnManager(cfg, nil)
+ srvMngr.AddServices(tS, reS,
NewLoaderService(cfg, db, filterSChan, server, engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db)
if err = srvMngr.StartServices(); err != nil {
t.Error(err)
diff --git a/services/schedulers_it_test.go b/services/schedulers_it_test.go
index c899b80ff..ab9edfbe8 100644
--- a/services/schedulers_it_test.go
+++ b/services/schedulers_it_test.go
@@ -47,7 +47,8 @@ func TestSchedulerSReload(t *testing.T) {
srvMngr := servmanager.NewServiceManager(cfg, engineShutdown)
db := NewDataDBService(cfg, nil)
schS := NewSchedulerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil)
- srvMngr.AddServices(NewConnManagerService(cfg, nil), schS,
+ engine.NewConnManager(cfg, nil)
+ srvMngr.AddServices(schS,
NewLoaderService(cfg, db, filterSChan, server, engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db)
if err = srvMngr.StartServices(); err != nil {
t.Error(err)
diff --git a/services/sessions.go b/services/sessions.go
index 70bc09c78..d5e82ed40 100644
--- a/services/sessions.go
+++ b/services/sessions.go
@@ -129,7 +129,6 @@ func (smg *SessionService) GetIntenternalChan() (conn chan rpcclient.ClientConne
// Reload handles the change of config
func (smg *SessionService) Reload() (err error) {
-
sReplConns, err := sessions.NewSReplConns(smg.cfg.SessionSCfg().ReplicationConns,
smg.cfg.GeneralCfg().Reconnects, smg.cfg.GeneralCfg().ConnectTimeout,
smg.cfg.GeneralCfg().ReplyTimeout)
diff --git a/services/sessions_it_test.go b/services/sessions_it_test.go
index a81494b0a..a89d94e77 100644
--- a/services/sessions_it_test.go
+++ b/services/sessions_it_test.go
@@ -80,7 +80,8 @@ func TestSessionSReload(t *testing.T) {
make(chan rpcclient.ClientConnector, 1),
nil)
srv := NewSessionService(cfg, db, server, make(chan rpcclient.ClientConnector, 1), engineShutdown, nil)
- srvMngr.AddServices(NewConnManagerService(cfg, nil), srv, chrS, schS, ralS, cdrS,
+ engine.NewConnManager(cfg, nil)
+ srvMngr.AddServices(srv, chrS, schS, ralS, cdrS,
NewLoaderService(cfg, db, filterSChan, server, engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db, stordb)
if err = srvMngr.StartServices(); err != nil {
t.Error(err)
diff --git a/services/stats_it_test.go b/services/stats_it_test.go
index ef6b6e8b8..776a01f71 100644
--- a/services/stats_it_test.go
+++ b/services/stats_it_test.go
@@ -56,7 +56,8 @@ func TestStatSReload(t *testing.T) {
db := NewDataDBService(cfg, nil)
tS := NewThresholdService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1))
sS := NewStatService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil)
- srvMngr.AddServices(NewConnManagerService(cfg, nil), tS, sS,
+ engine.NewConnManager(cfg, nil)
+ srvMngr.AddServices(tS, sS,
NewLoaderService(cfg, db, filterSChan, server, engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db)
if err = srvMngr.StartServices(); err != nil {
t.Error(err)
diff --git a/services/suppliers_it_test.go b/services/suppliers_it_test.go
index 04a478b77..9ede9f206 100644
--- a/services/suppliers_it_test.go
+++ b/services/suppliers_it_test.go
@@ -54,7 +54,8 @@ func TestSupplierSReload(t *testing.T) {
db := NewDataDBService(cfg, nil)
sts := NewStatService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil)
supS := NewSupplierService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil)
- srvMngr.AddServices(NewConnManagerService(cfg, nil), supS, sts,
+ engine.NewConnManager(cfg, nil)
+ srvMngr.AddServices(supS, sts,
NewLoaderService(cfg, db, filterSChan, server, engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db)
if err = srvMngr.StartServices(); err != nil {
t.Error(err)
diff --git a/services/thresholds_it_test.go b/services/thresholds_it_test.go
index e2c280732..7d4e6632f 100644
--- a/services/thresholds_it_test.go
+++ b/services/thresholds_it_test.go
@@ -50,7 +50,8 @@ func TestThresholdSReload(t *testing.T) {
srvMngr := servmanager.NewServiceManager(cfg, engineShutdown)
db := NewDataDBService(cfg, nil)
tS := NewThresholdService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1))
- srvMngr.AddServices(NewConnManagerService(cfg, nil), tS,
+ engine.NewConnManager(cfg, nil)
+ srvMngr.AddServices(tS,
NewLoaderService(cfg, db, filterSChan, server, engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db)
if err = srvMngr.StartServices(); err != nil {
t.Error(err)
diff --git a/services/utils.go b/services/utils.go
deleted file mode 100644
index 5deaacb12..000000000
--- a/services/utils.go
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
-Copyright (C) ITsysCOM GmbH
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see
-*/
-
-package services
-
-import (
- "github.com/cgrates/cgrates/config"
- "github.com/cgrates/cgrates/engine"
- "github.com/cgrates/rpcclient"
-)
-
-// NewConnection returns a new connection
-func NewConnection(cfg *config.CGRConfig, serviceConnChan, dispatcherSChan chan rpcclient.ClientConnector,
- conns []*config.RemoteHost) (rpcclient.ClientConnector, error) {
- if len(conns) == 0 {
- return nil, nil
- }
- internalChan := serviceConnChan
- if cfg.DispatcherSCfg().Enabled {
- internalChan = dispatcherSChan
- }
- return engine.NewRPCPool(rpcclient.PoolFirst,
- cfg.TlsCfg().ClientKey,
- cfg.TlsCfg().ClientCerificate, cfg.TlsCfg().CaCertificate,
- cfg.GeneralCfg().ConnectAttempts, cfg.GeneralCfg().Reconnects,
- cfg.GeneralCfg().ConnectTimeout, cfg.GeneralCfg().ReplyTimeout,
- conns, internalChan, false)
-}
diff --git a/servmanager/servmanager.go b/servmanager/servmanager.go
index 08ea81577..fafaa2e80 100644
--- a/servmanager/servmanager.go
+++ b/servmanager/servmanager.go
@@ -147,7 +147,6 @@ func (srvMngr *ServiceManager) GetConfig() *config.CGRConfig {
func (srvMngr *ServiceManager) StartServices() (err error) {
go srvMngr.handleReload()
for serviceName, shouldRun := range map[string]bool{
- utils.RPCConnS: true,
utils.AttributeS: srvMngr.GetConfig().AttributeSCfg().Enabled,
utils.ChargerS: srvMngr.GetConfig().ChargerSCfg().Enabled,
utils.ThresholdS: srvMngr.GetConfig().ThresholdSCfg().Enabled,
@@ -305,10 +304,6 @@ func (srvMngr *ServiceManager) handleReload() {
if err = srvMngr.reloadService(utils.StorDB); err != nil {
return
}
- case <-srvMngr.GetConfig().GetReloadChan(config.RPCConnsJsonName):
- if err = srvMngr.reloadService(utils.RPCConnS); err != nil {
- return
- }
}
// handle RPC server
}
diff --git a/utils/consts.go b/utils/consts.go
index b274ddf22..f597fa8a4 100755
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -709,7 +709,6 @@ const (
CDRServer = "CDRServer"
ResponderS = "ResponderS"
GuardianS = "GuardianS"
- RPCConnS = "RPCConnS"
)
// Lower service names