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

Change TypeOf RplDataDb & RmtDataDb from DataDB To DataManager

Browse Source
This commit is contained in:
TeoV
2019-11-04 15:04:43 +02:00
committed by Dan Christian Bogos
parent 5d0081b211
commit c30c6062ce
5 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,11 +239,11 @@ func main() {
if err != nil {
log.Fatalf("Coud not open dataDB connection: %s", err.Error())
}
var rmtDBConns, rplDBConns []engine.DataDB
var rmtDBConns, rplDBConns []*engine.DataManager
if len(ldrCfg.DataDbCfg().RmtDataDBCfgs) != 0 {
rmtDBConns = make([]engine.DataDB, len(ldrCfg.DataDbCfg().RmtDataDBCfgs))
rmtDBConns = make([]*engine.DataManager, len(ldrCfg.DataDbCfg().RmtDataDBCfgs))
for i, dbCfg := range ldrCfg.DataDbCfg().RmtDataDBCfgs {
rmtDBConns[i], err = engine.NewDataDBConn(dbCfg.DataDbType,
dbConn, err := engine.NewDataDBConn(dbCfg.DataDbType,
dbCfg.DataDbHost, dbCfg.DataDbPort,
dbCfg.DataDbName, dbCfg.DataDbUser,
dbCfg.DataDbPass, ldrCfg.GeneralCfg().DBDataEncoding,
@@ -251,12 +251,13 @@ func main() {
if err != nil {
log.Fatalf("Coud not open dataDB connection: %s", err.Error())
}
rmtDBConns[i] = engine.NewDataManager(dbConn, nil, nil, nil)
}
}
if len(ldrCfg.DataDbCfg().RplDataDBCfgs) != 0 {
rplDBConns = make([]engine.DataDB, len(ldrCfg.DataDbCfg().RplDataDBCfgs))
rplDBConns = make([]*engine.DataManager, len(ldrCfg.DataDbCfg().RplDataDBCfgs))
for i, dbCfg := range ldrCfg.DataDbCfg().RplDataDBCfgs {
rplDBConns[i], err = engine.NewDataDBConn(dbCfg.DataDbType,
dbConn, err := engine.NewDataDBConn(dbCfg.DataDbType,
dbCfg.DataDbHost, dbCfg.DataDbPort,
dbCfg.DataDbName, dbCfg.DataDbUser,
dbCfg.DataDbPass, ldrCfg.GeneralCfg().DBDataEncoding,
@@ -264,6 +265,7 @@ func main() {
if err != nil {
log.Fatalf("Coud not open dataDB connection: %s", err.Error())
}
rplDBConns[i] = engine.NewDataManager(dbConn, nil, nil, nil)
}
}
dm = engine.NewDataManager(d, config.CgrConfig().CacheCfg(), rmtDBConns, rplDBConns)

6
engine/datamanager.go
View File

@@ -90,7 +90,7 @@ var (
)
// NewDataManager returns a new DataManager
func NewDataManager(dataDB DataDB, cacheCfg config.CacheCfg, rmtDataDBs, rplDataDBs []DataDB) *DataManager {
func NewDataManager(dataDB DataDB, cacheCfg config.CacheCfg, rmtDataDBs, rplDataDBs []*DataManager) *DataManager {
return &DataManager{
dataDB: dataDB,
cacheCfg: cacheCfg,
@@ -103,8 +103,8 @@ func NewDataManager(dataDB DataDB, cacheCfg config.CacheCfg, rmtDataDBs, rplData
// transparently manages data retrieval, further serialization and caching
type DataManager struct {
dataDB DataDB
rmtDataDBs []DataDB
rplDataDBs []DataDB
rmtDataDBs []*DataManager
rplDataDBs []*DataManager
cacheCfg config.CacheCfg
}

12
engine/libtest.go
View File

@@ -292,11 +292,11 @@ func InitDataDb(cfg *config.CGRConfig) error {
if err != nil {
return err
}
var rmtDBConns, rplDBConns []DataDB
var rmtDBConns, rplDBConns []*DataManager
if len(cfg.DataDbCfg().RmtDataDBCfgs) != 0 {
rmtDBConns = make([]DataDB, len(cfg.DataDbCfg().RmtDataDBCfgs))
rmtDBConns = make([]*DataManager, len(cfg.DataDbCfg().RmtDataDBCfgs))
for i, dbCfg := range cfg.DataDbCfg().RmtDataDBCfgs {
rmtDBConns[i], err = NewDataDBConn(dbCfg.DataDbType,
dbConn, err := NewDataDBConn(dbCfg.DataDbType,
dbCfg.DataDbHost, dbCfg.DataDbPort,
dbCfg.DataDbName, dbCfg.DataDbUser,
dbCfg.DataDbPass, cfg.GeneralCfg().DBDataEncoding,
@@ -304,12 +304,13 @@ func InitDataDb(cfg *config.CGRConfig) error {
if err != nil {
return err
}
rmtDBConns[i] = NewDataManager(dbConn, nil, nil, nil)
}
}
if len(cfg.DataDbCfg().RplDataDBCfgs) != 0 {
rplDBConns = make([]DataDB, len(cfg.DataDbCfg().RplDataDBCfgs))
rplDBConns = make([]*DataManager, len(cfg.DataDbCfg().RplDataDBCfgs))
for i, dbCfg := range cfg.DataDbCfg().RplDataDBCfgs {
rplDBConns[i], err = NewDataDBConn(dbCfg.DataDbType,
dbConn, err := NewDataDBConn(dbCfg.DataDbType,
dbCfg.DataDbHost, dbCfg.DataDbPort,
dbCfg.DataDbName, dbCfg.DataDbUser,
dbCfg.DataDbPass, cfg.GeneralCfg().DBDataEncoding,
@@ -317,6 +318,7 @@ func InitDataDb(cfg *config.CGRConfig) error {
if err != nil {
return err
}
rplDBConns[i] = NewDataManager(dbConn, nil, nil, nil)
}
}
dm := NewDataManager(d, cfg.CacheCfg(), rmtDBConns, rplDBConns)

13
engine/tpreader.go
View File

@@ -68,12 +68,11 @@ type TpReader struct {
func NewTpReader(db DataDB, lr LoadReader, tpid, timezone string,
cacheS rpcclient.RpcClientConnection, schedulerS rpcclient.RpcClientConnection) (*TpReader, error) {
var err error
var rmtDBConns, rplDBConns []DataDB
var rmtDBConns, rplDBConns []*DataManager
if len(config.CgrConfig().DataDbCfg().RmtDataDBCfgs) != 0 {
rmtDBConns = make([]DataDB, len(config.CgrConfig().DataDbCfg().RmtDataDBCfgs))
rmtDBConns = make([]*DataManager, len(config.CgrConfig().DataDbCfg().RmtDataDBCfgs))
for i, dbCfg := range config.CgrConfig().DataDbCfg().RmtDataDBCfgs {
rmtDBConns[i], err = NewDataDBConn(dbCfg.DataDbType,
dbConn, err := NewDataDBConn(dbCfg.DataDbType,
dbCfg.DataDbHost, dbCfg.DataDbPort,
dbCfg.DataDbName, dbCfg.DataDbUser,
dbCfg.DataDbPass, config.CgrConfig().GeneralCfg().DBDataEncoding,
@@ -81,12 +80,13 @@ func NewTpReader(db DataDB, lr LoadReader, tpid, timezone string,
if err != nil {
return nil, err
}
rmtDBConns[i] = NewDataManager(dbConn, nil, nil, nil)
}
}
if len(config.CgrConfig().DataDbCfg().RplDataDBCfgs) != 0 {
rplDBConns = make([]DataDB, len(config.CgrConfig().DataDbCfg().RplDataDBCfgs))
rplDBConns = make([]*DataManager, len(config.CgrConfig().DataDbCfg().RplDataDBCfgs))
for i, dbCfg := range config.CgrConfig().DataDbCfg().RplDataDBCfgs {
rplDBConns[i], err = NewDataDBConn(dbCfg.DataDbType,
dbConn, err := NewDataDBConn(dbCfg.DataDbType,
dbCfg.DataDbHost, dbCfg.DataDbPort,
dbCfg.DataDbName, dbCfg.DataDbUser,
dbCfg.DataDbPass, config.CgrConfig().GeneralCfg().DBDataEncoding,
@@ -94,6 +94,7 @@ func NewTpReader(db DataDB, lr LoadReader, tpid, timezone string,
if err != nil {
return nil, err
}
rplDBConns[i] = NewDataManager(dbConn, nil, nil, nil)
}
}
tpr := &TpReader{

12
services/datadb.go
View File

@@ -68,11 +68,11 @@ func (db *DataDBService) Start() (err error) {
utils.Logger.Warning(fmt.Sprintf("Could not configure dataDb: %s.Some SessionS APIs will not work", err))
return
}
var rmtDBConns, rplDBConns []engine.DataDB
var rmtDBConns, rplDBConns []*engine.DataManager
if len(db.cfg.DataDbCfg().RmtDataDBCfgs) != 0 {
rmtDBConns = make([]engine.DataDB, len(db.cfg.DataDbCfg().RmtDataDBCfgs))
rmtDBConns = make([]*engine.DataManager, len(db.cfg.DataDbCfg().RmtDataDBCfgs))
for i, dbCfg := range db.cfg.DataDbCfg().RmtDataDBCfgs {
rmtDBConns[i], err = engine.NewDataDBConn(dbCfg.DataDbType,
dbConn, err := engine.NewDataDBConn(dbCfg.DataDbType,
dbCfg.DataDbHost, dbCfg.DataDbPort,
dbCfg.DataDbName, dbCfg.DataDbUser,
dbCfg.DataDbPass, db.cfg.GeneralCfg().DBDataEncoding,
@@ -80,12 +80,13 @@ func (db *DataDBService) Start() (err error) {
if err != nil {
log.Fatalf("Coud not open dataDB connection: %s", err.Error())
}
rmtDBConns[i] = engine.NewDataManager(dbConn, nil, nil, nil)
}
}
if len(db.cfg.DataDbCfg().RplDataDBCfgs) != 0 {
rplDBConns = make([]engine.DataDB, len(db.cfg.DataDbCfg().RplDataDBCfgs))
rplDBConns = make([]*engine.DataManager, len(db.cfg.DataDbCfg().RplDataDBCfgs))
for i, dbCfg := range db.cfg.DataDbCfg().RplDataDBCfgs {
rplDBConns[i], err = engine.NewDataDBConn(dbCfg.DataDbType,
dbConn, err := engine.NewDataDBConn(dbCfg.DataDbType,
dbCfg.DataDbHost, dbCfg.DataDbPort,
dbCfg.DataDbName, dbCfg.DataDbUser,
dbCfg.DataDbPass, db.cfg.GeneralCfg().DBDataEncoding,
@@ -93,6 +94,7 @@ func (db *DataDBService) Start() (err error) {
if err != nil {
log.Fatalf("Coud not open dataDB connection: %s", err.Error())
}
rplDBConns[i] = engine.NewDataManager(dbConn, nil, nil, nil)
}
}
db.db = engine.NewDataManager(d, db.cfg.CacheCfg(), rmtDBConns, rplDBConns)