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

Populate in data manager rmtDataDbConns and rplDataDBConns

Browse Source
This commit is contained in:
TeoV
2019-11-01 08:25:24 -04:00
committed by Dan Christian Bogos
parent e8db46d6b8
commit 714e37fa63
42 changed files with 312 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
cmd/cgr-loader/cgr-loader.go
View File

@@ -239,7 +239,34 @@ func main() {
if err != nil {
log.Fatalf("Coud not open dataDB connection: %s", err.Error())
}
dm = engine.NewDataManager(d, config.CgrConfig().CacheCfg())
var rmtDBConns, rplDBConns []engine.DataDB
if len(ldrCfg.DataDbCfg().RmtDataDBCfgs) != 0 {
rmtDBConns = make([]engine.DataDB, len(ldrCfg.DataDbCfg().RmtDataDBCfgs))
for i, dbCfg := range ldrCfg.DataDbCfg().RmtDataDBCfgs {
rmtDBConns[i], err = engine.NewDataDBConn(dbCfg.DataDbType,
dbCfg.DataDbHost, dbCfg.DataDbPort,
dbCfg.DataDbName, dbCfg.DataDbUser,
dbCfg.DataDbPass, ldrCfg.GeneralCfg().DBDataEncoding,
dbCfg.DataDbSentinelName)
if err != nil {
log.Fatalf("Coud not open dataDB connection: %s", err.Error())
}
}
}
if len(ldrCfg.DataDbCfg().RplDataDBCfgs) != 0 {
rplDBConns = make([]engine.DataDB, len(ldrCfg.DataDbCfg().RplDataDBCfgs))
for i, dbCfg := range ldrCfg.DataDbCfg().RplDataDBCfgs {
rplDBConns[i], err = engine.NewDataDBConn(dbCfg.DataDbType,
dbCfg.DataDbHost, dbCfg.DataDbPort,
dbCfg.DataDbName, dbCfg.DataDbUser,
dbCfg.DataDbPass, ldrCfg.GeneralCfg().DBDataEncoding,
dbCfg.DataDbSentinelName)
if err != nil {
log.Fatalf("Coud not open dataDB connection: %s", err.Error())
}
}
}
dm = engine.NewDataManager(d, config.CgrConfig().CacheCfg(), rmtDBConns, rplDBConns)
defer dm.DataDB().Close()
}
@@ -321,9 +348,11 @@ func main() {
}
}
tpReader := engine.NewTpReader(dm.DataDB(), loader, ldrCfg.LoaderCgrCfg().TpID,
tpReader, err := engine.NewTpReader(dm.DataDB(), loader, ldrCfg.LoaderCgrCfg().TpID,
ldrCfg.GeneralCfg().DefaultTimezone, cacheS, schedulerS)
if err != nil {
log.Fatal(err)
}
if err = tpReader.LoadAll(); err != nil {
log.Fatal(err)
}

2
cmd/cgr-tester/cgr-tester.go
View File

@@ -79,7 +79,7 @@ func durInternalRater(cd *engine.CallDescriptor) (time.Duration, error) {
if err != nil {
return nilDuration, fmt.Errorf("Could not connect to data database: %s", err.Error())
}
dm := engine.NewDataManager(dbConn, cgrConfig.CacheCfg()) // for the momentn we use here "" for sentinelName
dm := engine.NewDataManager(dbConn, cgrConfig.CacheCfg(), nil, nil) // for the momentn we use here "" for sentinelName
defer dm.DataDB().Close()
engine.SetDataStorage(dm)
if err := dm.LoadDataDBCache(nil, nil, nil, nil, nil, nil, nil, nil,