From 4f55783b687fdca22658c9cdeca5bdcffe6d32af Mon Sep 17 00:00:00 2001 From: edwardro22 Date: Thu, 18 Jan 2018 10:52:58 +0200 Subject: [PATCH] Refactored Interactive defaults --- cmd/cgr-loader/cgr-loader.go | 20 ++++++++-------- cmd/cgr-migrator/cgr-migrator.go | 40 ++++++++++++++++---------------- config/config.go | 30 ++++++++++++------------ 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index 157c89ae5..9fcf89e3c 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -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, diff --git a/cmd/cgr-migrator/cgr-migrator.go b/cmd/cgr-migrator/cgr-migrator.go index 0f14f70de..88a988dfc 100755 --- a/cmd/cgr-migrator/cgr-migrator.go +++ b/cmd/cgr-migrator/cgr-migrator.go @@ -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 diff --git a/config/config.go b/config/config.go index 3fec10a6b..354297905 100755 --- a/config/config.go +++ b/config/config.go @@ -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"] }