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

Renamed opts for DataDB and StorDB

Browse Source
This commit is contained in:
andronache
2021-05-05 17:41:11 +03:00
committed by Dan Christian Bogos
parent 0089659476
commit bc4979b74a
27 changed files with 150 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/datadb.go
View File

@@ -95,7 +95,7 @@ func (db *DataDBService) Reload() (err error) {
}
if db.cfg.DataDbCfg().Type == utils.Mongo {
var ttl time.Duration
if ttl, err = utils.IfaceAsDuration(db.cfg.DataDbCfg().Opts[utils.QueryTimeoutCfg]); err != nil {
if ttl, err = utils.IfaceAsDuration(db.cfg.DataDbCfg().Opts[utils.MongoQueryTimeoutCfg]); err != nil {
return
}
mgo, canCast := db.dm.DataDB().(*engine.MongoStorage)

14
services/datadb_it_test.go
View File

@@ -88,7 +88,7 @@ func TestDataDBReload(t *testing.T) {
Name: "10",
User: "cgrates",
Opts: map[string]interface{}{
utils.QueryTimeoutCfg: "10s",
utils.MongoQueryTimeoutCfg: "10s",
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,
@@ -255,7 +255,7 @@ func TestDataDBReloadBadType(t *testing.T) {
Name: "10",
User: "cgrates",
Opts: map[string]interface{}{
utils.QueryTimeoutCfg: "10s",
utils.MongoQueryTimeoutCfg: "10s",
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,
@@ -378,7 +378,7 @@ func TestDataDBReloadErrorMarsheler(t *testing.T) {
Name: "10",
User: "cgrates",
Opts: map[string]interface{}{
utils.QueryTimeoutCfg: "10s",
utils.MongoQueryTimeoutCfg: "10s",
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,
@@ -596,7 +596,7 @@ func TestDataDBReloadCastError(t *testing.T) {
Name: "10",
User: "cgrates",
Opts: map[string]interface{}{
utils.QueryTimeoutCfg: "10s",
utils.MongoQueryTimeoutCfg: "10s",
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,
@@ -756,7 +756,7 @@ func TestDataDBReloadIfaceAsDurationError(t *testing.T) {
Name: "10",
User: "cgrates",
Opts: map[string]interface{}{
utils.QueryTimeoutCfg: "10s",
utils.MongoQueryTimeoutCfg: "10s",
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,
@@ -846,7 +846,7 @@ func TestDataDBReloadIfaceAsDurationError(t *testing.T) {
Remote: false},
},
}
cfg.DataDbCfg().Opts[utils.QueryTimeoutCfg] = true
cfg.DataDbCfg().Opts[utils.MongoQueryTimeoutCfg] = true
db.dm = nil
err = db.Reload()
if err == nil || err.Error() != "cannot convert field: true to time.Duration" {
@@ -898,7 +898,7 @@ func TestDataDBReloadError(t *testing.T) {
Name: "10",
User: "cgrates",
Opts: map[string]interface{}{
utils.QueryTimeoutCfg: "10s",
utils.MongoQueryTimeoutCfg: "10s",
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,

2
services/datadb_test.go
View File

@@ -53,7 +53,7 @@ func TestDataDBCoverage(t *testing.T) {
Name: "10",
User: "cgrates",
Opts: map[string]interface{}{
utils.QueryTimeoutCfg: "10s",
utils.MongoQueryTimeoutCfg: "10s",
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,

8
services/stordb.go
View File

@@ -102,7 +102,7 @@ func (db *StorDBService) Reload() (err error) {
db.cfg.StorDbCfg().Type)
}
var ttl time.Duration
if ttl, err = utils.IfaceAsDuration(db.cfg.StorDbCfg().Opts[utils.QueryTimeoutCfg]); err != nil {
if ttl, err = utils.IfaceAsDuration(db.cfg.StorDbCfg().Opts[utils.MongoQueryTimeoutCfg]); err != nil {
return
}
mgo.SetTTL(ttl)
@@ -114,13 +114,13 @@ func (db *StorDBService) Reload() (err error) {
db.cfg.StorDbCfg().Type)
}
var maxConn, maxIdleConn, connMaxLifetime int64
if maxConn, err = utils.IfaceAsTInt64(db.cfg.StorDbCfg().Opts[utils.MaxOpenConnsCfg]); err != nil {
if maxConn, err = utils.IfaceAsTInt64(db.cfg.StorDbCfg().Opts[utils.SQLMaxOpenConnsCfg]); err != nil {
return
}
if maxIdleConn, err = utils.IfaceAsTInt64(db.cfg.StorDbCfg().Opts[utils.MaxIdleConnsCfg]); err != nil {
if maxIdleConn, err = utils.IfaceAsTInt64(db.cfg.StorDbCfg().Opts[utils.SQLMaxIdleConnsCfg]); err != nil {
return
}
if connMaxLifetime, err = utils.IfaceAsTInt64(db.cfg.StorDbCfg().Opts[utils.ConnMaxLifetimeCfg]); err != nil {
if connMaxLifetime, err = utils.IfaceAsTInt64(db.cfg.StorDbCfg().Opts[utils.SQLConnMaxLifetimeCfg]); err != nil {
return
}
msql.Db.SetMaxOpenConns(int(maxConn))

16
services/stordb_it_test.go
View File

@@ -421,7 +421,7 @@ func TestStorDBReloadCanCastError(t *testing.T) {
cfg.StorDbCfg().Type = utils.Mongo
stordb := NewStorDBService(cfg, srvDep)
stordb.cfg.StorDbCfg().Opts = map[string]interface{}{
utils.QueryTimeoutCfg: false,
utils.MongoQueryTimeoutCfg: false,
}
stordb.db = &engine.MongoStorage{}
stordb.oldDBCfg = cfg.StorDbCfg().Clone()
@@ -445,7 +445,7 @@ func TestStorDBReloadIfaceAsTIntMaxOpenConnsCfgError(t *testing.T) {
cfg.StorDbCfg().Type = utils.MySQL
stordb := NewStorDBService(cfg, srvDep)
stordb.cfg.StorDbCfg().Opts = map[string]interface{}{
utils.MaxOpenConnsCfg: false,
utils.SQLMaxOpenConnsCfg: false,
}
stordb.db = &engine.SQLStorage{}
stordb.oldDBCfg = cfg.StorDbCfg().Clone()
@@ -470,9 +470,9 @@ func TestStorDBReloadIfaceAsTIntConnMaxLifetimeCfgError(t *testing.T) {
cfg.StorDbCfg().Type = utils.MySQL
stordb := NewStorDBService(cfg, srvDep)
stordb.cfg.StorDbCfg().Opts = map[string]interface{}{
utils.MaxOpenConnsCfg: 1,
utils.MaxIdleConnsCfg: 1,
utils.ConnMaxLifetimeCfg: false,
utils.SQLMaxOpenConnsCfg: 1,
utils.SQLMaxIdleConnsCfg: 1,
utils.SQLConnMaxLifetimeCfg: false,
}
stordb.db = &engine.SQLStorage{}
stordb.oldDBCfg = cfg.StorDbCfg().Clone()
@@ -497,9 +497,9 @@ func TestStorDBReloadIfaceAsTIntMaxIdleConnsCfgError(t *testing.T) {
cfg.StorDbCfg().Type = utils.MySQL
stordb := NewStorDBService(cfg, srvDep)
stordb.cfg.StorDbCfg().Opts = map[string]interface{}{
utils.MaxOpenConnsCfg: 1,
utils.MaxIdleConnsCfg: false,
utils.ConnMaxLifetimeCfg: 1,
utils.SQLMaxOpenConnsCfg: 1,
utils.SQLMaxIdleConnsCfg: false,
utils.SQLConnMaxLifetimeCfg: 1,
}
stordb.db = &engine.SQLStorage{}
stordb.oldDBCfg = cfg.StorDbCfg().Clone()