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

Refactored Interactive defaults

Browse Source
This commit is contained in:
edwardro22
2018-01-18 10:52:58 +02:00
committed by Dan Christian Bogos
parent d9bf42bff4
commit 4f55783b68
3 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,18 +83,18 @@ func main() {
var loader engine.LoadReader
*datadb_type = strings.TrimPrefix(*datadb_type, "*")
*datadb_host = config.DBDefaults.DBHost(*datadb_type, datadb_host)
*datadb_port = config.DBDefaults.DBPort(*datadb_type, datadb_port)
*datadb_name = config.DBDefaults.DBName(*datadb_type, datadb_name)
*datadb_user = config.DBDefaults.DBUser(*datadb_type, datadb_user)
*datadb_pass = config.DBDefaults.DBPass(*datadb_type, datadb_pass)
*datadb_host = config.DBDefaults.DBHost(*datadb_type, *datadb_host)
*datadb_port = config.DBDefaults.DBPort(*datadb_type, *datadb_port)
*datadb_name = config.DBDefaults.DBName(*datadb_type, *datadb_name)
*datadb_user = config.DBDefaults.DBUser(*datadb_type, *datadb_user)
*datadb_pass = config.DBDefaults.DBPass(*datadb_type, *datadb_pass)
*stor_db_type = strings.TrimPrefix(*stor_db_type, "*")
*stor_db_host = config.DBDefaults.DBHost(*stor_db_type, stor_db_host)
*stor_db_port = config.DBDefaults.DBPort(*stor_db_type, stor_db_port)
*stor_db_name = config.DBDefaults.DBName(*stor_db_type, stor_db_name)
*stor_db_user = config.DBDefaults.DBUser(*stor_db_type, stor_db_user)
*stor_db_pass = config.DBDefaults.DBPass(*stor_db_type, stor_db_pass)
*stor_db_host = config.DBDefaults.DBHost(*stor_db_type, *stor_db_host)
*stor_db_port = config.DBDefaults.DBPort(*stor_db_type, *stor_db_port)
*stor_db_name = config.DBDefaults.DBName(*stor_db_type, *stor_db_name)
*stor_db_user = config.DBDefaults.DBUser(*stor_db_type, *stor_db_user)
*stor_db_pass = config.DBDefaults.DBPass(*stor_db_type, *stor_db_pass)
if !*toStorDb {
dm, errDataDB = engine.ConfigureDataStorage(*datadb_type, *datadb_host, *datadb_port, *datadb_name,

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

@@ -86,18 +86,18 @@ func main() {
return
}
*inDataDBType = strings.TrimPrefix(*inDataDBType, "*")
*inDataDBHost = config.DBDefaults.DBHost(*inDataDBType, inDataDBHost)
*inDataDBPort = config.DBDefaults.DBPort(*inDataDBType, inDataDBPort)
*inDataDBName = config.DBDefaults.DBName(*inDataDBType, inDataDBName)
*inDataDBUser = config.DBDefaults.DBUser(*inDataDBType, inDataDBUser)
*inDataDBPass = config.DBDefaults.DBPass(*inDataDBType, inDataDBPass)
*inDataDBHost = config.DBDefaults.DBHost(*inDataDBType, *inDataDBHost)
*inDataDBPort = config.DBDefaults.DBPort(*inDataDBType, *inDataDBPort)
*inDataDBName = config.DBDefaults.DBName(*inDataDBType, *inDataDBName)
*inDataDBUser = config.DBDefaults.DBUser(*inDataDBType, *inDataDBUser)
*inDataDBPass = config.DBDefaults.DBPass(*inDataDBType, *inDataDBPass)
*inStorDBType = strings.TrimPrefix(*inStorDBType, "*")
*inStorDBHost = config.DBDefaults.DBHost(*inStorDBType, inStorDBHost)
*inStorDBPort = config.DBDefaults.DBPort(*inStorDBType, inStorDBPort)
*inStorDBName = config.DBDefaults.DBName(*inStorDBType, inStorDBName)
*inStorDBUser = config.DBDefaults.DBUser(*inStorDBType, inStorDBUser)
*inStorDBPass = config.DBDefaults.DBPass(*inStorDBType, inStorDBPass)
*inStorDBHost = config.DBDefaults.DBHost(*inStorDBType, *inStorDBHost)
*inStorDBPort = config.DBDefaults.DBPort(*inStorDBType, *inStorDBPort)
*inStorDBName = config.DBDefaults.DBName(*inStorDBType, *inStorDBName)
*inStorDBUser = config.DBDefaults.DBUser(*inStorDBType, *inStorDBUser)
*inStorDBPass = config.DBDefaults.DBPass(*inStorDBType, *inStorDBPass)
if *outDataDBType == utils.MetaDynamic {
*outDataDBType = *inDataDBType
@@ -108,20 +108,20 @@ func main() {
*outDataDBPass = *inDataDBPass
} else {
*outDataDBType = strings.TrimPrefix(*outDataDBType, "*")
*outDataDBHost = config.DBDefaults.DBHost(*outDataDBType, outDataDBHost)
*outDataDBPort = config.DBDefaults.DBPort(*outDataDBType, outDataDBPort)
*outDataDBName = config.DBDefaults.DBName(*outDataDBType, outDataDBName)
*outDataDBUser = config.DBDefaults.DBUser(*outDataDBType, outDataDBUser)
*outDataDBPass = config.DBDefaults.DBPass(*outDataDBType, outDataDBPass)
*outDataDBHost = config.DBDefaults.DBHost(*outDataDBType, *outDataDBHost)
*outDataDBPort = config.DBDefaults.DBPort(*outDataDBType, *outDataDBPort)
*outDataDBName = config.DBDefaults.DBName(*outDataDBType, *outDataDBName)
*outDataDBUser = config.DBDefaults.DBUser(*outDataDBType, *outDataDBUser)
*outDataDBPass = config.DBDefaults.DBPass(*outDataDBType, *outDataDBPass)
}
if *outStorDBType != utils.MetaDynamic {
*outStorDBType = strings.TrimPrefix(*outStorDBType, "*")
*outStorDBHost = config.DBDefaults.DBHost(*outStorDBType, outStorDBHost)
*outStorDBPort = config.DBDefaults.DBPort(*outStorDBType, outStorDBPort)
*outStorDBName = config.DBDefaults.DBName(*outStorDBType, outStorDBName)
*outStorDBUser = config.DBDefaults.DBUser(*outStorDBType, outStorDBUser)
*outStorDBPass = config.DBDefaults.DBPass(*outStorDBType, outStorDBPass)
*outStorDBHost = config.DBDefaults.DBHost(*outStorDBType, *outStorDBHost)
*outStorDBPort = config.DBDefaults.DBPort(*outStorDBType, *outStorDBPort)
*outStorDBName = config.DBDefaults.DBName(*outStorDBType, *outStorDBName)
*outStorDBUser = config.DBDefaults.DBUser(*outStorDBType, *outStorDBUser)
*outStorDBPass = config.DBDefaults.DBPass(*outStorDBType, *outStorDBPass)
}
var dmIN *engine.DataManager

30
config/config.go
View File

@@ -78,37 +78,37 @@ func NewDbDefaults() DbDefaults {
type DbDefaults map[string]map[string]string
func (dbDflt DbDefaults) DBName(dbType string, flagInput *string) string {
if *flagInput != utils.MetaDynamic {
return *flagInput
func (dbDflt DbDefaults) DBName(dbType string, flagInput string) string {
if flagInput != utils.MetaDynamic {
return flagInput
}
return dbDflt[dbType]["DbName"]
}
func (DbDefaults) DBUser(dbType string, flagInput *string) string {
if *flagInput != utils.MetaDynamic {
return *flagInput
func (DbDefaults) DBUser(dbType string, flagInput string) string {
if flagInput != utils.MetaDynamic {
return flagInput
}
return utils.CGRATES
}
func (DbDefaults) DBHost(dbType string, flagInput *string) string {
if *flagInput != utils.MetaDynamic {
return *flagInput
func (DbDefaults) DBHost(dbType string, flagInput string) string {
if flagInput != utils.MetaDynamic {
return flagInput
}
return utils.LOCALHOST
}
func (self DbDefaults) DBPort(dbType string, flagInput *string) string {
if *flagInput != utils.MetaDynamic {
return *flagInput
func (self DbDefaults) DBPort(dbType string, flagInput string) string {
if flagInput != utils.MetaDynamic {
return flagInput
}
return self[dbType]["DbPort"]
}
func (self DbDefaults) DBPass(dbType string, flagInput *string) string {
if *flagInput != utils.MetaDynamic {
return *flagInput
func (self DbDefaults) DBPass(dbType string, flagInput string) string {
if flagInput != utils.MetaDynamic {
return flagInput
}
return self[dbType]["DbPass"]
}