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

Updated DataDB reload

Browse Source
This commit is contained in:
Trial97
2019-10-28 15:51:27 +02:00
committed by Dan Christian Bogos
parent 5eca54a588
commit 146bf6d52e
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/config.go
View File

@@ -1517,6 +1517,7 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
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)
if !fall {
break
}
@@ -1544,6 +1545,7 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
case SCHEDULER_JSN:
if !fall {
cfg.rldChans[DATADB_JSN] <- struct{}{} // reload datadb before
time.Sleep(1) // to force the context switch( to be sure we start the DB before a service that needs it)
}
cfg.rldChans[SCHEDULER_JSN] <- struct{}{}
if !fall {
@@ -1553,6 +1555,7 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
case RALS_JSN:
if !fall {
cfg.rldChans[DATADB_JSN] <- struct{}{} // reload datadb before
time.Sleep(1) // to force the context switch( to be sure we start the DB before a service that needs it)
}
cfg.rldChans[RALS_JSN] <- struct{}{}
if !fall {
@@ -1562,6 +1565,7 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
case CDRS_JSN:
if !fall {
cfg.rldChans[DATADB_JSN] <- struct{}{} // reload datadb before
time.Sleep(1) // to force the context switch( to be sure we start the DB before a service that needs it)
}
cfg.rldChans[CDRS_JSN] <- struct{}{}
if !fall {
@@ -1582,6 +1586,7 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
case SessionSJson:
if !fall {
cfg.rldChans[DATADB_JSN] <- struct{}{} // reload datadb before
time.Sleep(1) // to force the context switch( to be sure we start the DB before a service that needs it)
}
cfg.rldChans[SessionSJson] <- struct{}{}
if !fall {
@@ -1633,6 +1638,7 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
case ATTRIBUTE_JSN:
if !fall {
cfg.rldChans[DATADB_JSN] <- struct{}{} // reload datadb before
time.Sleep(1) // to force the context switch( to be sure we start the DB before a service that needs it)
}
cfg.rldChans[ATTRIBUTE_JSN] <- struct{}{}
if !fall {
@@ -1642,6 +1648,7 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
case ChargerSCfgJson:
if !fall {
cfg.rldChans[DATADB_JSN] <- struct{}{} // reload datadb before
time.Sleep(1) // to force the context switch( to be sure we start the DB before a service that needs it)
}
cfg.rldChans[ChargerSCfgJson] <- struct{}{}
if !fall {
@@ -1651,6 +1658,7 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
case RESOURCES_JSON:
if !fall {
cfg.rldChans[DATADB_JSN] <- struct{}{} // reload datadb before
time.Sleep(1) // to force the context switch( to be sure we start the DB before a service that needs it)
}
cfg.rldChans[RESOURCES_JSON] <- struct{}{}
if !fall {
@@ -1660,6 +1668,7 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
case STATS_JSON:
if !fall {
cfg.rldChans[DATADB_JSN] <- struct{}{} // reload datadb before
time.Sleep(1) // to force the context switch( to be sure we start the DB before a service that needs it)
}
cfg.rldChans[STATS_JSON] <- struct{}{}
if !fall {
@@ -1669,6 +1678,7 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
case THRESHOLDS_JSON:
if !fall {
cfg.rldChans[DATADB_JSN] <- struct{}{} // reload datadb before
time.Sleep(1) // to force the context switch( to be sure we start the DB before a service that needs it)
}
cfg.rldChans[THRESHOLDS_JSON] <- struct{}{}
if !fall {
@@ -1678,6 +1688,7 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
case SupplierSJson:
if !fall {
cfg.rldChans[DATADB_JSN] <- struct{}{} // reload datadb before
time.Sleep(1) // to force the context switch( to be sure we start the DB before a service that needs it)
}
cfg.rldChans[SupplierSJson] <- struct{}{}
if !fall {
@@ -1687,6 +1698,7 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
case LoaderJson:
if !fall {
cfg.rldChans[DATADB_JSN] <- struct{}{} // reload datadb before
time.Sleep(1) // to force the context switch( to be sure we start the DB before a service that needs it)
}
cfg.rldChans[LoaderJson] <- struct{}{}
if !fall {
@@ -1696,6 +1708,7 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
case DispatcherSJson:
if !fall {
cfg.rldChans[DATADB_JSN] <- struct{}{} // reload datadb before
time.Sleep(1) // to force the context switch( to be sure we start the DB before a service that needs it)
}
cfg.rldChans[DispatcherSJson] <- struct{}{}
if !fall {

2
services/cdrs_it_test.go
View File

@@ -67,7 +67,7 @@ func TestCdrsReload(t *testing.T) {
srvMngr := servmanager.NewServiceManager(cfg, engineShutdown)
db := NewDataDBService(cfg)
chrS := NewChargerService(cfg, db, chS, filterSChan, server, nil, nil)
schS := NewSchedulerService(cfg, nil, chS, server, make(chan rpcclient.RpcClientConnection, 1), nil)
schS := NewSchedulerService(cfg, db, chS, server, make(chan rpcclient.RpcClientConnection, 1), nil)
tS := NewThresholdService(cfg, db, chS, filterSChan, server)
ralS := NewRalService(cfg, db, nil, nil, chS, filterSChan, server,
tS.GetIntenternalChan(), internalChan, cacheSChan, internalChan, internalChan,

2
services/rals_it_test.go
View File

@@ -65,7 +65,7 @@ func TestRalsReload(t *testing.T) {
server := utils.NewServer()
srvMngr := servmanager.NewServiceManager(cfg, engineShutdown)
db := NewDataDBService(cfg)
schS := NewSchedulerService(cfg, nil, chS, server, make(chan rpcclient.RpcClientConnection, 1), nil)
schS := NewSchedulerService(cfg, db, chS, server, make(chan rpcclient.RpcClientConnection, 1), nil)
tS := NewThresholdService(cfg, db, chS, filterSChan, server)
ralS := NewRalService(cfg, db, nil, nil, chS, filterSChan, server,
tS.GetIntenternalChan(), internalChan, cacheSChan, internalChan, internalChan,

2
services/sessions_it_test.go
View File

@@ -69,7 +69,7 @@ func TestSessionSReload(t *testing.T) {
srvMngr := servmanager.NewServiceManager(cfg, engineShutdown)
db := NewDataDBService(cfg)
chrS := NewChargerService(cfg, db, chS, filterSChan, server, nil, nil)
schS := NewSchedulerService(cfg, nil, chS, server, make(chan rpcclient.RpcClientConnection, 1), nil)
schS := NewSchedulerService(cfg, db, chS, server, make(chan rpcclient.RpcClientConnection, 1), nil)
ralS := NewRalService(cfg, db, nil, nil, chS, filterSChan, server,
/*tS*/ internalChan, internalChan, cacheSChan, internalChan, internalChan,
internalChan, schS, engineShutdown)