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

Rename dispatcher to dispatchers in registrarc

Browse Source
This commit is contained in:
andronache
2021-06-10 13:20:22 +03:00
committed by Dan Christian Bogos
parent 213787ee80
commit a27c22ba4e
14 changed files with 113 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
registrarc/registrarc.go
View File

@@ -47,11 +47,11 @@ type RegistrarCService struct {
func (dhS *RegistrarCService) ListenAndServe(stopChan, rldChan <-chan struct{}) {
dTm, rTm := &time.Timer{}, &time.Timer{}
var dTmStarted, rTmStarted bool
if dTmStarted = dhS.cfg.RegistrarCCfg().Dispatchers.Enabled; dTmStarted {
if len(dhS.cfg.RegistrarCCfg().Dispatchers.RegistrarSConns) != 0 {
dTm = time.NewTimer(dhS.cfg.RegistrarCCfg().Dispatchers.RefreshInterval)
dhS.registerDispHosts()
}
if rTmStarted = dhS.cfg.RegistrarCCfg().RPC.Enabled; rTmStarted {
if len(dhS.cfg.RegistrarCCfg().RPC.RegistrarSConns) != 0 {
rTm = time.NewTimer(dhS.cfg.RegistrarCCfg().RPC.RefreshInterval)
dhS.registerRPCHosts()
}
@@ -64,19 +64,19 @@ func (dhS *RegistrarCService) ListenAndServe(stopChan, rldChan <-chan struct{})
if dTmStarted {
dTm.Stop()
}
if dTmStarted = dhS.cfg.RegistrarCCfg().Dispatchers.Enabled; dTmStarted {
if len(dhS.cfg.RegistrarCCfg().Dispatchers.RegistrarSConns) != 0 {
dTm = time.NewTimer(dhS.cfg.RegistrarCCfg().Dispatchers.RefreshInterval)
dhS.registerDispHosts()
}
if rTmStarted = dhS.cfg.RegistrarCCfg().RPC.Enabled; rTmStarted {
if len(dhS.cfg.RegistrarCCfg().RPC.RegistrarSConns) != 0 {
rTm = time.NewTimer(dhS.cfg.RegistrarCCfg().RPC.RefreshInterval)
dhS.registerRPCHosts()
}
case <-stopChan:
if dhS.cfg.RegistrarCCfg().Dispatchers.Enabled {
if len(dhS.cfg.RegistrarCCfg().Dispatchers.RegistrarSConns) != 0 {
dTm.Stop()
}
if dhS.cfg.RegistrarCCfg().RPC.Enabled {
if len(dhS.cfg.RegistrarCCfg().RPC.RegistrarSConns) != 0 {
rTm.Stop()
}
return
@@ -93,11 +93,11 @@ func (dhS *RegistrarCService) ListenAndServe(stopChan, rldChan <-chan struct{})
// Shutdown is called to shutdown the service
func (dhS *RegistrarCService) Shutdown() {
utils.Logger.Info(fmt.Sprintf("<%s> service shutdown initialized", utils.RegistrarC))
if dhS.cfg.RegistrarCCfg().Dispatchers.Enabled {
if len(dhS.cfg.RegistrarCCfg().Dispatchers.RegistrarSConns) != 0 {
unregisterHosts(dhS.connMgr, dhS.cfg.RegistrarCCfg().Dispatchers,
dhS.cfg.GeneralCfg().DefaultTenant, utils.RegistrarSv1UnregisterDispatcherHosts)
}
if dhS.cfg.RegistrarCCfg().RPC.Enabled {
if len(dhS.cfg.RegistrarCCfg().RPC.RegistrarSConns) != 0 {
unregisterHosts(dhS.connMgr, dhS.cfg.RegistrarCCfg().RPC,
dhS.cfg.GeneralCfg().DefaultTenant, utils.RegistrarSv1UnregisterRPCHosts)
}

7
registrarc/registrarc_test.go
View File

@@ -45,7 +45,6 @@ func TestDispatcherHostsService(t *testing.T) {
Transport: rpcclient.HTTPjson,
}},
}
cfg.RegistrarCCfg().Dispatchers.Enabled = true
cfg.RegistrarCCfg().Dispatchers.Hosts = map[string][]*config.RemoteHost{
utils.MetaDefault: {
{
@@ -127,8 +126,6 @@ func TestDispatcherHostsService(t *testing.T) {
func TestRegistrarcListenAndServe(t *testing.T) {
//cover purposes only
cfg := config.NewDefaultCGRConfig()
cfg.RegistrarCCfg().Dispatchers.Enabled = true
cfg.RegistrarCCfg().RPC.Enabled = true
regStSrv := NewRegistrarCService(cfg, nil)
stopChan := make(chan struct{}, 1)
rldChan := make(chan struct{}, 1)
@@ -194,9 +191,7 @@ func TestRegisterRPCHosts(t *testing.T) {
func TestRegistrarcListenAndServedTmCDispatcher(t *testing.T) {
//cover purposes only
cfg := config.NewDefaultCGRConfig()
cfg.RegistrarCCfg().Dispatchers.Enabled = true
cfg.RegistrarCCfg().Dispatchers.RefreshInterval = 1
cfg.RegistrarCCfg().RPC.Enabled = true
regStSrv := NewRegistrarCService(cfg, nil)
stopChan := make(chan struct{}, 1)
rldChan := make(chan struct{}, 1)
@@ -211,8 +206,6 @@ func TestRegistrarcListenAndServedTmCDispatcher(t *testing.T) {
func TestRegistrarcListenAndServedTmCRPC(t *testing.T) {
//cover purposes only
cfg := config.NewDefaultCGRConfig()
cfg.RegistrarCCfg().Dispatchers.Enabled = true
cfg.RegistrarCCfg().RPC.Enabled = true
cfg.RegistrarCCfg().RPC.RefreshInterval = 1
regStSrv := NewRegistrarCService(cfg, nil)
stopChan := make(chan struct{}, 1)