uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-16 13:49:53 +05:00
Code Issues Packages Projects Releases Wiki Activity

Change datadb cfg opts constant names

Browse Source
This commit is contained in:
ionutboangiu
2021-10-07 18:33:24 +03:00
committed by Dan Christian Bogos
parent bff3e1d143
commit c48aa5d4ad
12 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,10 +66,10 @@ var (
"The delay before executing the commands if the redis cluster is in the CLUSTERDOWN state")
dbQueryTimeout = cgrLoaderFlags.String(utils.MongoQueryTimeoutCfg, utils.IfaceAsString(dfltCfg.DataDbCfg().Opts[utils.MongoQueryTimeoutCfg]),
"The timeout for queries")
dbRedisTls = cgrLoaderFlags.Bool(utils.RedisTLS, false, "Enable TLS when connecting to Redis")
dbRedisClientCertificate = cgrLoaderFlags.String(utils.RedisClientCertificate, utils.EmptyString, "Path to the client certificate")
dbRedisClientKey = cgrLoaderFlags.String(utils.RedisClientKey, utils.EmptyString, "Path to the client key")
dbRedisCACertificate = cgrLoaderFlags.String(utils.RedisCACertificate, utils.EmptyString, "Path to the CA certificate")
dbRedisTls = cgrLoaderFlags.Bool(utils.RedisTLSCfg, false, "Enable TLS when connecting to Redis")
dbRedisClientCertificate = cgrLoaderFlags.String(utils.RedisClientCertificateCfg, utils.EmptyString, "Path to the client certificate")
dbRedisClientKey = cgrLoaderFlags.String(utils.RedisClientKeyCfg, utils.EmptyString, "Path to the client key")
dbRedisCACertificate = cgrLoaderFlags.String(utils.RedisCACertificateCfg, utils.EmptyString, "Path to the CA certificate")
storDBType = cgrLoaderFlags.String(utils.StorDBTypeCgr, dfltCfg.StorDbCfg().Type,
"The type of the storDb database <*mysql|*postgres|*mongo>")

8
cmd/cgr-loader/cgr-loader_it_test.go
View File

@@ -83,10 +83,10 @@ func TestLoadConfig(t *testing.T) {
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisClusterCfg: false,
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
RmtConns: []string{},
RplConns: []string{},

8
cmd/cgr-migrator/cgr-migrator.go
View File

@@ -75,10 +75,10 @@ var (
"The delay before executing the commands if the redis cluster is in the CLUSTERDOWN state")
dbQueryTimeout = cgrMigratorFlags.String(utils.MongoQueryTimeoutCfg, utils.IfaceAsString(dfltCfg.DataDbCfg().Opts[utils.MongoQueryTimeoutCfg]),
"The timeout for queries")
dbRedisTls = cgrMigratorFlags.Bool(utils.RedisTLS, false, "Enable TLS when connecting to Redis")
dbRedisClientCertificate = cgrMigratorFlags.String(utils.RedisClientCertificate, utils.EmptyString, "Path to the client certificate")
dbRedisClientKey = cgrMigratorFlags.String(utils.RedisClientKey, utils.EmptyString, "Path to the client key")
dbRedisCACertificate = cgrMigratorFlags.String(utils.RedisCACertificate, utils.EmptyString, "Path to the CA certificate")
dbRedisTls = cgrMigratorFlags.Bool(utils.RedisTLSCfg, false, "Enable TLS when connecting to Redis")
dbRedisClientCertificate = cgrMigratorFlags.String(utils.RedisClientCertificateCfg, utils.EmptyString, "Path to the client certificate")
dbRedisClientKey = cgrMigratorFlags.String(utils.RedisClientKeyCfg, utils.EmptyString, "Path to the client key")
dbRedisCACertificate = cgrMigratorFlags.String(utils.RedisCACertificateCfg, utils.EmptyString, "Path to the CA certificate")
outDataDBType = cgrMigratorFlags.String(utils.OutDataDBTypeCfg, utils.MetaDataDB,
"output DataDB type <*redis|*mongo>")

16
config/config_json_test.go
View File

@@ -319,10 +319,10 @@ func TestDfDataDbJsonCfg(t *testing.T) {
utils.RedisClusterCfg: false,
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisClusterSyncCfg: "5s",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
Items: map[string]*ItemOptJson{
utils.MetaAccounts: {
@@ -1830,10 +1830,10 @@ func TestDfMigratorCfg(t *testing.T) {
utils.RedisClusterCfg: false,
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
}
dfCgrJSONCfg, err := NewCgrJsonCfgFromBytes([]byte(CGRATES_CFG_JSON))

16
config/config_test.go
View File

@@ -3628,10 +3628,10 @@ func TestCgrMigratorCfgDefault(t *testing.T) {
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,
utils.RedisSentinelNameCfg: "",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
OutStorDBOpts: make(map[string]interface{}),
}
@@ -4732,10 +4732,10 @@ func TestV1GetConfigSectionMigrator(t *testing.T) {
utils.RedisClusterCfg: false,
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
},
}

8
config/configdbcfg.go
View File

@@ -107,10 +107,10 @@ func (dbcfg ConfigDBCfg) AsMapInterface(string) interface{} {
utils.RedisClusterSyncCfg: dbcfg.Opts.RedisClusterSync.String(),
utils.RedisClusterOnDownDelayCfg: dbcfg.Opts.RedisClusterOndownDelay.String(),
utils.MongoQueryTimeoutCfg: dbcfg.Opts.MongoQueryTimeout.String(),
utils.RedisTLS: dbcfg.Opts.RedisTLS,
utils.RedisClientCertificate: dbcfg.Opts.RedisClientCertificate,
utils.RedisClientKey: dbcfg.Opts.RedisClientKey,
utils.RedisCACertificate: dbcfg.Opts.RedisCACertificate,
utils.RedisTLSCfg: dbcfg.Opts.RedisTLS,
utils.RedisClientCertificateCfg: dbcfg.Opts.RedisClientCertificate,
utils.RedisClientKeyCfg: dbcfg.Opts.RedisClientKey,
utils.RedisCACertificateCfg: dbcfg.Opts.RedisCACertificate,
}
mp := map[string]interface{}{
utils.DataDbTypeCfg: utils.Meta + dbcfg.Type,

8
config/datadbcfg.go
View File

@@ -249,10 +249,10 @@ func (dbcfg DataDbCfg) AsMapInterface(string) interface{} {
utils.RedisClusterSyncCfg: dbcfg.Opts.RedisClusterSync.String(),
utils.RedisClusterOnDownDelayCfg: dbcfg.Opts.RedisClusterOndownDelay.String(),
utils.MongoQueryTimeoutCfg: dbcfg.Opts.MongoQueryTimeout.String(),
utils.RedisTLS: dbcfg.Opts.RedisTLS,
utils.RedisClientCertificate: dbcfg.Opts.RedisClientCertificate,
utils.RedisClientKey: dbcfg.Opts.RedisClientKey,
utils.RedisCACertificate: dbcfg.Opts.RedisCACertificate,
utils.RedisTLSCfg: dbcfg.Opts.RedisTLS,
utils.RedisClientCertificateCfg: dbcfg.Opts.RedisClientCertificate,
utils.RedisClientKeyCfg: dbcfg.Opts.RedisClientKey,
utils.RedisCACertificateCfg: dbcfg.Opts.RedisCACertificate,
}
mp := map[string]interface{}{
utils.DataDbTypeCfg: utils.Meta + dbcfg.Type,

40
config/migratorcfg_test.go
View File

@@ -66,10 +66,10 @@ func TestMigratorCgrCfgloadFromJsonCfg(t *testing.T) {
utils.RedisClusterCfg: true,
utils.RedisClusterSyncCfg: "10s",
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
OutStorDBOpts: map[string]interface{}{
utils.RedisSentinelNameCfg: utils.EmptyString,
@@ -125,10 +125,10 @@ func TestMigratorCgrCfgAsMapInterface(t *testing.T) {
utils.RedisClusterCfg: true,
utils.RedisClusterSyncCfg: "2s",
utils.RedisClusterOnDownDelayCfg: "1",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
}
if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr); err != nil {
@@ -168,10 +168,10 @@ func TestMigratorCgrCfgAsMapInterface1(t *testing.T) {
utils.RedisClusterCfg: false,
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
}
if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr); err != nil {
@@ -206,10 +206,10 @@ func TestMigratorCgrCfgAsMapInterface2(t *testing.T) {
utils.RedisClusterCfg: false,
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
}
if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr); err != nil {
@@ -241,10 +241,10 @@ func TestMigratorCgrCfgClone(t *testing.T) {
utils.RedisClusterCfg: true,
utils.RedisClusterSyncCfg: "10s",
utils.RedisClusterOnDownDelayCfg: "0",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
OutStorDBOpts: map[string]interface{}{
utils.RedisSentinelNameCfg: utils.EmptyString,

8
engine/storage_utils.go
View File

@@ -55,15 +55,15 @@ func NewDataDBConn(dbType, host, port, name, user,
return
}
var hasTLSConn bool
if hasTLSConn, err = utils.IfaceAsBool(opts[utils.RedisTLS]); err != nil {
if hasTLSConn, err = utils.IfaceAsBool(opts[utils.RedisTLSCfg]); err != nil {
return
}
d, err = NewRedisStorage(host, dbNo, user, pass, marshaler,
utils.RedisMaxConns, utils.RedisMaxAttempts, utils.IfaceAsString(opts[utils.RedisSentinelNameCfg]),
isCluster, clusterSync, clusterOnDownDelay, hasTLSConn,
utils.IfaceAsString(opts[utils.RedisClientCertificate]),
utils.IfaceAsString(opts[utils.RedisClientKey]),
utils.IfaceAsString(opts[utils.RedisCACertificate]))
utils.IfaceAsString(opts[utils.RedisClientCertificateCfg]),
utils.IfaceAsString(opts[utils.RedisClientKeyCfg]),
utils.IfaceAsString(opts[utils.RedisCACertificateCfg]))
case utils.Mongo:
var ttl time.Duration
if ttl, err = utils.IfaceAsDuration(opts[utils.MongoQueryTimeoutCfg]); err != nil {

48
services/datadb_it_test.go
View File

@@ -91,10 +91,10 @@ func TestDataDBReload(t *testing.T) {
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,
utils.RedisSentinelNameCfg: "",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
RmtConns: []string{},
RplConns: []string{},
@@ -231,10 +231,10 @@ func TestDataDBReloadBadType(t *testing.T) {
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,
utils.RedisSentinelNameCfg: "",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
RmtConns: []string{},
RplConns: []string{},
@@ -336,10 +336,10 @@ func TestDataDBReloadErrorMarsheler(t *testing.T) {
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,
utils.RedisSentinelNameCfg: "",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
RmtConns: []string{},
RplConns: []string{},
@@ -523,10 +523,10 @@ func TestDataDBReloadCastError(t *testing.T) {
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,
utils.RedisSentinelNameCfg: "",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
RmtConns: []string{},
RplConns: []string{},
@@ -659,10 +659,10 @@ func TestDataDBReloadIfaceAsDurationError(t *testing.T) {
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,
utils.RedisSentinelNameCfg: "",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
RmtConns: []string{},
RplConns: []string{},
@@ -786,10 +786,10 @@ func TestDataDBReloadError(t *testing.T) {
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,
utils.RedisSentinelNameCfg: "",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
RmtConns: []string{},
RplConns: []string{},

8
services/datadb_test.go
View File

@@ -58,10 +58,10 @@ func TestDataDBCoverage(t *testing.T) {
utils.RedisClusterSyncCfg: "5s",
utils.RedisClusterCfg: false,
utils.RedisSentinelNameCfg: "",
utils.RedisTLS: false,
utils.RedisClientCertificate: "",
utils.RedisClientKey: "",
utils.RedisCACertificate: "",
utils.RedisTLSCfg: false,
utils.RedisClientCertificateCfg: "",
utils.RedisClientKeyCfg: "",
utils.RedisCACertificateCfg: "",
},
RmtConns: []string{},
RplConns: []string{},

8
utils/consts.go
View File

@@ -1730,10 +1730,10 @@ const (
RedisClusterCfg = "redisCluster"
RedisClusterSyncCfg = "redisClusterSync"
RedisClusterOnDownDelayCfg = "redisClusterOndownDelay"
RedisTLS = "redisTLS"
RedisClientCertificate = "redisClientCertificate"
RedisClientKey = "redisClientKey"
RedisCACertificate = "redisCACertificate"
RedisTLSCfg = "redisTLS"
RedisClientCertificateCfg = "redisClientCertificate"
RedisClientKeyCfg = "redisClientKey"
RedisCACertificateCfg = "redisCACertificate"
ReplicationFilteredCfg = "replication_filtered"
ReplicationCache = "replication_cache"
RemoteConnIDCfg = "remote_conn_id"