diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index 693fdf5b5..8737b2404 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -474,16 +474,16 @@ func main() { var loadDb engine.LoadStorage var cdrDb engine.CdrStorage if cfg.RaterEnabled || cfg.SchedulerEnabled { // Only connect to dataDb if required - ratingDb, err = engine.ConfigureRatingStorage(cfg.RatingDBType, cfg.RatingDBHost, cfg.RatingDBPort, - cfg.RatingDBName, cfg.RatingDBUser, cfg.RatingDBPass, cfg.DBDataEncoding) + ratingDb, err = engine.ConfigureRatingStorage(cfg.TpDbType, cfg.TpDbHost, cfg.TpDbPort, + cfg.TpDbName, cfg.TpDbUser, cfg.TpDbPass, cfg.DBDataEncoding) if err != nil { // Cannot configure getter database, show stopper engine.Logger.Crit(fmt.Sprintf("Could not configure dataDb: %s exiting!", err)) return } defer ratingDb.Close() engine.SetRatingStorage(ratingDb) - accountDb, err = engine.ConfigureAccountingStorage(cfg.AccountDBType, cfg.AccountDBHost, cfg.AccountDBPort, - cfg.AccountDBName, cfg.AccountDBUser, cfg.AccountDBPass, cfg.DBDataEncoding) + accountDb, err = engine.ConfigureAccountingStorage(cfg.DataDbType, cfg.DataDbHost, cfg.DataDbPort, + cfg.DataDbName, cfg.DataDbUser, cfg.DataDbPass, cfg.DBDataEncoding) if err != nil { // Cannot configure getter database, show stopper engine.Logger.Crit(fmt.Sprintf("Could not configure dataDb: %s exiting!", err)) return diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index 094022756..9148301ed 100644 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -34,19 +34,19 @@ import ( var ( //separator = flag.String("separator", ",", "Default field separator") cgrConfig, _ = config.NewDefaultCGRConfig() - ratingdb_type = flag.String("ratingdb_type", cgrConfig.RatingDBType, "The type of the RatingDb database ") - ratingdb_host = flag.String("ratingdb_host", cgrConfig.RatingDBHost, "The RatingDb host to connect to.") - ratingdb_port = flag.String("ratingdb_port", cgrConfig.RatingDBPort, "The RatingDb port to bind to.") - ratingdb_name = flag.String("ratingdb_name", cgrConfig.RatingDBName, "The name/number of the RatingDb to connect to.") - ratingdb_user = flag.String("ratingdb_user", cgrConfig.RatingDBUser, "The RatingDb user to sign in as.") - ratingdb_pass = flag.String("ratingdb_passwd", cgrConfig.RatingDBPass, "The RatingDb user's password.") + ratingdb_type = flag.String("ratingdb_type", cgrConfig.TpDbType, "The type of the RatingDb database ") + ratingdb_host = flag.String("ratingdb_host", cgrConfig.TpDbHost, "The RatingDb host to connect to.") + ratingdb_port = flag.String("ratingdb_port", cgrConfig.TpDbPort, "The RatingDb port to bind to.") + ratingdb_name = flag.String("ratingdb_name", cgrConfig.TpDbName, "The name/number of the RatingDb to connect to.") + ratingdb_user = flag.String("ratingdb_user", cgrConfig.TpDbUser, "The RatingDb user to sign in as.") + ratingdb_pass = flag.String("ratingdb_passwd", cgrConfig.TpDbPass, "The RatingDb user's password.") - accountdb_type = flag.String("accountdb_type", cgrConfig.AccountDBType, "The type of the AccountingDb database ") - accountdb_host = flag.String("accountdb_host", cgrConfig.AccountDBHost, "The AccountingDb host to connect to.") - accountdb_port = flag.String("accountdb_port", cgrConfig.AccountDBPort, "The AccountingDb port to bind to.") - accountdb_name = flag.String("accountdb_name", cgrConfig.AccountDBName, "The name/number of the AccountingDb to connect to.") - accountdb_user = flag.String("accountdb_user", cgrConfig.AccountDBUser, "The AccountingDb user to sign in as.") - accountdb_pass = flag.String("accountdb_passwd", cgrConfig.AccountDBPass, "The AccountingDb user's password.") + accountdb_type = flag.String("accountdb_type", cgrConfig.DataDbType, "The type of the AccountingDb database ") + accountdb_host = flag.String("accountdb_host", cgrConfig.DataDbHost, "The AccountingDb host to connect to.") + accountdb_port = flag.String("accountdb_port", cgrConfig.DataDbPort, "The AccountingDb port to bind to.") + accountdb_name = flag.String("accountdb_name", cgrConfig.DataDbName, "The name/number of the AccountingDb to connect to.") + accountdb_user = flag.String("accountdb_user", cgrConfig.DataDbUser, "The AccountingDb user to sign in as.") + accountdb_pass = flag.String("accountdb_passwd", cgrConfig.DataDbPass, "The AccountingDb user's password.") stor_db_type = flag.String("stordb_type", cgrConfig.StorDBType, "The type of the storDb database ") stor_db_host = flag.String("stordb_host", cgrConfig.StorDBHost, "The storDb host to connect to.") diff --git a/cmd/cgr-tester/cgr-tester.go b/cmd/cgr-tester/cgr-tester.go index 1c3999a3d..8e03417c1 100644 --- a/cmd/cgr-tester/cgr-tester.go +++ b/cmd/cgr-tester/cgr-tester.go @@ -40,18 +40,18 @@ var ( memprofile = flag.String("memprofile", "", "write memory profile to this file") runs = flag.Int("runs", 10000, "stress cycle number") parallel = flag.Int("parallel", 0, "run n requests in parallel") - ratingdb_type = flag.String("ratingdb_type", cgrConfig.RatingDBType, "The type of the RatingDb database ") - ratingdb_host = flag.String("ratingdb_host", cgrConfig.RatingDBHost, "The RatingDb host to connect to.") - ratingdb_port = flag.String("ratingdb_port", cgrConfig.RatingDBPort, "The RatingDb port to bind to.") - ratingdb_name = flag.String("ratingdb_name", cgrConfig.RatingDBName, "The name/number of the RatingDb to connect to.") - ratingdb_user = flag.String("ratingdb_user", cgrConfig.RatingDBUser, "The RatingDb user to sign in as.") - ratingdb_pass = flag.String("ratingdb_passwd", cgrConfig.RatingDBPass, "The RatingDb user's password.") - accountdb_type = flag.String("accountdb_type", cgrConfig.AccountDBType, "The type of the AccountingDb database ") - accountdb_host = flag.String("accountdb_host", cgrConfig.AccountDBHost, "The AccountingDb host to connect to.") - accountdb_port = flag.String("accountdb_port", cgrConfig.AccountDBPort, "The AccountingDb port to bind to.") - accountdb_name = flag.String("accountdb_name", cgrConfig.AccountDBName, "The name/number of the AccountingDb to connect to.") - accountdb_user = flag.String("accountdb_user", cgrConfig.AccountDBUser, "The AccountingDb user to sign in as.") - accountdb_pass = flag.String("accountdb_passwd", cgrConfig.AccountDBPass, "The AccountingDb user's password.") + ratingdb_type = flag.String("ratingdb_type", cgrConfig.TpDbType, "The type of the RatingDb database ") + ratingdb_host = flag.String("ratingdb_host", cgrConfig.TpDbHost, "The RatingDb host to connect to.") + ratingdb_port = flag.String("ratingdb_port", cgrConfig.TpDbPort, "The RatingDb port to bind to.") + ratingdb_name = flag.String("ratingdb_name", cgrConfig.TpDbName, "The name/number of the RatingDb to connect to.") + ratingdb_user = flag.String("ratingdb_user", cgrConfig.TpDbUser, "The RatingDb user to sign in as.") + ratingdb_pass = flag.String("ratingdb_passwd", cgrConfig.TpDbPass, "The RatingDb user's password.") + accountdb_type = flag.String("accountdb_type", cgrConfig.DataDbType, "The type of the AccountingDb database ") + accountdb_host = flag.String("accountdb_host", cgrConfig.DataDbHost, "The AccountingDb host to connect to.") + accountdb_port = flag.String("accountdb_port", cgrConfig.DataDbPort, "The AccountingDb port to bind to.") + accountdb_name = flag.String("accountdb_name", cgrConfig.DataDbName, "The name/number of the AccountingDb to connect to.") + accountdb_user = flag.String("accountdb_user", cgrConfig.DataDbUser, "The AccountingDb user to sign in as.") + accountdb_pass = flag.String("accountdb_passwd", cgrConfig.DataDbPass, "The AccountingDb user's password.") dbdata_encoding = flag.String("dbdata_encoding", cgrConfig.DBDataEncoding, "The encoding used to store object data in strings.") raterAddress = flag.String("rater_address", "", "Rater address for remote tests. Empty for internal rater.") tor = flag.String("tor", utils.VOICE, "The type of record to use in queries.") diff --git a/config/config.go b/config/config.go index e78aad64a..db2a6d613 100644 --- a/config/config.go +++ b/config/config.go @@ -157,18 +157,18 @@ func NewCGRConfigFromFolder(cfgDir string) (*CGRConfig, error) { // Holds system configuration, defaults are overwritten with values from config file if found type CGRConfig struct { - RatingDBType string - RatingDBHost string // The host to connect to. Values that start with / are for UNIX domain sockets. - RatingDBPort string // The port to bind to. - RatingDBName string // The name of the database to connect to. - RatingDBUser string // The user to sign in as. - RatingDBPass string // The user's password. - AccountDBType string - AccountDBHost string // The host to connect to. Values that start with / are for UNIX domain sockets. - AccountDBPort string // The port to bind to. - AccountDBName string // The name of the database to connect to. - AccountDBUser string // The user to sign in as. - AccountDBPass string // The user's password. + TpDbType string + TpDbHost string // The host to connect to. Values that start with / are for UNIX domain sockets. + TpDbPort string // The port to bind to. + TpDbName string // The name of the database to connect to. + TpDbUser string // The user to sign in as. + TpDbPass string // The user's password. + DataDbType string + DataDbHost string // The host to connect to. Values that start with / are for UNIX domain sockets. + DataDbPort string // The port to bind to. + DataDbName string // The name of the database to connect to. + DataDbUser string // The user to sign in as. + DataDbPass string // The user's password. StorDBType string // Should reflect the database type used to store logs StorDBHost string // The host to connect to. Values that start with / are for UNIX domain sockets. StorDBPort string // Th e port to bind to. @@ -343,12 +343,12 @@ func (self *CGRConfig) loadFromJsonCfg(jsnCfg *CgrJsonCfg) error { return err } - jsnRatingDbCfg, err := jsnCfg.DbJsonCfg(RATINGDB_JSN) + jsnTpDbCfg, err := jsnCfg.DbJsonCfg(TPDB_JSN) if err != nil { return err } - jsnAccountingDbCfg, err := jsnCfg.DbJsonCfg(ACCOUNTINGDB_JSN) + jsnDataDbCfg, err := jsnCfg.DbJsonCfg(DATADB_JSN) if err != nil { return err } @@ -434,45 +434,45 @@ func (self *CGRConfig) loadFromJsonCfg(jsnCfg *CgrJsonCfg) error { } // All good, start populating config variables - if jsnRatingDbCfg != nil { - if jsnRatingDbCfg.Db_type != nil { - self.RatingDBType = *jsnRatingDbCfg.Db_type + if jsnTpDbCfg != nil { + if jsnTpDbCfg.Db_type != nil { + self.TpDbType = *jsnTpDbCfg.Db_type } - if jsnRatingDbCfg.Db_host != nil { - self.RatingDBHost = *jsnRatingDbCfg.Db_host + if jsnTpDbCfg.Db_host != nil { + self.TpDbHost = *jsnTpDbCfg.Db_host } - if jsnRatingDbCfg.Db_port != nil { - self.RatingDBPort = strconv.Itoa(*jsnRatingDbCfg.Db_port) + if jsnTpDbCfg.Db_port != nil { + self.TpDbPort = strconv.Itoa(*jsnTpDbCfg.Db_port) } - if jsnRatingDbCfg.Db_name != nil { - self.RatingDBName = *jsnRatingDbCfg.Db_name + if jsnTpDbCfg.Db_name != nil { + self.TpDbName = *jsnTpDbCfg.Db_name } - if jsnRatingDbCfg.Db_user != nil { - self.RatingDBUser = *jsnRatingDbCfg.Db_user + if jsnTpDbCfg.Db_user != nil { + self.TpDbUser = *jsnTpDbCfg.Db_user } - if jsnRatingDbCfg.Db_passwd != nil { - self.RatingDBPass = *jsnRatingDbCfg.Db_passwd + if jsnTpDbCfg.Db_passwd != nil { + self.TpDbPass = *jsnTpDbCfg.Db_passwd } } - if jsnAccountingDbCfg != nil { - if jsnAccountingDbCfg.Db_type != nil { - self.AccountDBType = *jsnAccountingDbCfg.Db_type + if jsnDataDbCfg != nil { + if jsnDataDbCfg.Db_type != nil { + self.DataDbType = *jsnDataDbCfg.Db_type } - if jsnAccountingDbCfg.Db_host != nil { - self.AccountDBHost = *jsnAccountingDbCfg.Db_host + if jsnDataDbCfg.Db_host != nil { + self.DataDbHost = *jsnDataDbCfg.Db_host } - if jsnAccountingDbCfg.Db_port != nil { - self.AccountDBPort = strconv.Itoa(*jsnAccountingDbCfg.Db_port) + if jsnDataDbCfg.Db_port != nil { + self.DataDbPort = strconv.Itoa(*jsnDataDbCfg.Db_port) } - if jsnAccountingDbCfg.Db_name != nil { - self.AccountDBName = *jsnAccountingDbCfg.Db_name + if jsnDataDbCfg.Db_name != nil { + self.DataDbName = *jsnDataDbCfg.Db_name } - if jsnAccountingDbCfg.Db_user != nil { - self.AccountDBUser = *jsnAccountingDbCfg.Db_user + if jsnDataDbCfg.Db_user != nil { + self.DataDbUser = *jsnDataDbCfg.Db_user } - if jsnAccountingDbCfg.Db_passwd != nil { - self.AccountDBPass = *jsnAccountingDbCfg.Db_passwd + if jsnDataDbCfg.Db_passwd != nil { + self.DataDbPass = *jsnDataDbCfg.Db_passwd } } diff --git a/config/config_json.go b/config/config_json.go index b63708a22..da67bf270 100644 --- a/config/config_json.go +++ b/config/config_json.go @@ -27,31 +27,31 @@ import ( ) const ( - GENERAL_JSN = "general" - LISTEN_JSN = "listen" - RATINGDB_JSN = "tariffplan_db" - ACCOUNTINGDB_JSN = "data_db" - STORDB_JSN = "stor_db" - BALANCER_JSN = "balancer" - RATER_JSN = "rater" - SCHEDULER_JSN = "scheduler" - CDRS_JSN = "cdrs" - MEDIATOR_JSN = "mediator" - CDRSTATS_JSN = "cdrstats" - CDRE_JSN = "cdre" - CDRC_JSN = "cdrc" - SMFS_JSN = "sm_freeswitch" - SMKAM_JSN = "sm_kamailio" - SMOSIPS_JSN = "sm_opensips" - SM_JSN = "session_manager" - FS_JSN = "freeswitch" - KAMAILIO_JSN = "kamailio" - OSIPS_JSN = "opensips" - HISTSERV_JSN = "history_server" - HISTAGENT_JSN = "history_agent" - PUBSUBSERV_JSN = "pubsub_server" - PUBSUBAGENT_JSN = "pubsub_agent" - MAILER_JSN = "mailer" + GENERAL_JSN = "general" + LISTEN_JSN = "listen" + TPDB_JSN = "tariffplan_db" + DATADB_JSN = "data_db" + STORDB_JSN = "stor_db" + BALANCER_JSN = "balancer" + RATER_JSN = "rater" + SCHEDULER_JSN = "scheduler" + CDRS_JSN = "cdrs" + MEDIATOR_JSN = "mediator" + CDRSTATS_JSN = "cdrstats" + CDRE_JSN = "cdre" + CDRC_JSN = "cdrc" + SMFS_JSN = "sm_freeswitch" + SMKAM_JSN = "sm_kamailio" + SMOSIPS_JSN = "sm_opensips" + SM_JSN = "session_manager" + FS_JSN = "freeswitch" + KAMAILIO_JSN = "kamailio" + OSIPS_JSN = "opensips" + HISTSERV_JSN = "history_server" + HISTAGENT_JSN = "history_agent" + PUBSUBSERV_JSN = "pubsub_server" + PUBSUBAGENT_JSN = "pubsub_agent" + MAILER_JSN = "mailer" ) // Loads the json config out of io.Reader, eg other sources than file, maybe over http diff --git a/config/config_json_test.go b/config/config_json_test.go index 960fe8862..36fcd03a2 100644 --- a/config/config_json_test.go +++ b/config/config_json_test.go @@ -74,7 +74,7 @@ func TestDfDbJsonCfg(t *testing.T) { Db_user: utils.StringPointer(""), Db_passwd: utils.StringPointer(""), } - if cfg, err := dfCgrJsonCfg.DbJsonCfg(RATINGDB_JSN); err != nil { + if cfg, err := dfCgrJsonCfg.DbJsonCfg(TPDB_JSN); err != nil { t.Error(err) } else if !reflect.DeepEqual(eCfg, cfg) { t.Error("Received: ", cfg) @@ -87,7 +87,7 @@ func TestDfDbJsonCfg(t *testing.T) { Db_user: utils.StringPointer(""), Db_passwd: utils.StringPointer(""), } - if cfg, err := dfCgrJsonCfg.DbJsonCfg(ACCOUNTINGDB_JSN); err != nil { + if cfg, err := dfCgrJsonCfg.DbJsonCfg(DATADB_JSN); err != nil { t.Error(err) } else if !reflect.DeepEqual(eCfg, cfg) { t.Error("Received: ", cfg) diff --git a/engine/libtest.go b/engine/libtest.go index b1505d8b5..f7e710a27 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -33,12 +33,12 @@ import ( ) func InitDataDb(cfg *config.CGRConfig) error { - ratingDb, err := ConfigureRatingStorage(cfg.RatingDBType, cfg.RatingDBHost, cfg.RatingDBPort, cfg.RatingDBName, cfg.RatingDBUser, cfg.RatingDBPass, cfg.DBDataEncoding) + ratingDb, err := ConfigureRatingStorage(cfg.TpDbType, cfg.TpDbHost, cfg.TpDbPort, cfg.TpDbName, cfg.TpDbUser, cfg.TpDbPass, cfg.DBDataEncoding) if err != nil { return err } - accountDb, err := ConfigureAccountingStorage(cfg.AccountDBType, cfg.AccountDBHost, cfg.AccountDBPort, cfg.AccountDBName, - cfg.AccountDBUser, cfg.AccountDBPass, cfg.DBDataEncoding) + accountDb, err := ConfigureAccountingStorage(cfg.DataDbType, cfg.DataDbHost, cfg.DataDbPort, cfg.DataDbName, + cfg.DataDbUser, cfg.DataDbPass, cfg.DBDataEncoding) if err != nil { return err } diff --git a/engine/loader_local_test.go b/engine/loader_local_test.go index 99da5aa1b..a87769796 100644 --- a/engine/loader_local_test.go +++ b/engine/loader_local_test.go @@ -56,25 +56,25 @@ func TestConnDataDbs(t *testing.T) { } lCfg, _ = config.NewDefaultCGRConfig() var err error - if ratingDbCsv, err = ConfigureRatingStorage(lCfg.RatingDBType, lCfg.RatingDBHost, lCfg.RatingDBPort, "4", lCfg.RatingDBUser, lCfg.RatingDBPass, lCfg.DBDataEncoding); err != nil { + if ratingDbCsv, err = ConfigureRatingStorage(lCfg.TpDbType, lCfg.TpDbHost, lCfg.TpDbPort, "4", lCfg.TpDbUser, lCfg.TpDbPass, lCfg.DBDataEncoding); err != nil { t.Fatal("Error on ratingDb connection: ", err.Error()) } - if ratingDbStor, err = ConfigureRatingStorage(lCfg.RatingDBType, lCfg.RatingDBHost, lCfg.RatingDBPort, "5", lCfg.RatingDBUser, lCfg.RatingDBPass, lCfg.DBDataEncoding); err != nil { + if ratingDbStor, err = ConfigureRatingStorage(lCfg.TpDbType, lCfg.TpDbHost, lCfg.TpDbPort, "5", lCfg.TpDbUser, lCfg.TpDbPass, lCfg.DBDataEncoding); err != nil { t.Fatal("Error on ratingDb connection: ", err.Error()) } - if ratingDbApier, err = ConfigureRatingStorage(lCfg.RatingDBType, lCfg.RatingDBHost, lCfg.RatingDBPort, "6", lCfg.RatingDBUser, lCfg.RatingDBPass, lCfg.DBDataEncoding); err != nil { + if ratingDbApier, err = ConfigureRatingStorage(lCfg.TpDbType, lCfg.TpDbHost, lCfg.TpDbPort, "6", lCfg.TpDbUser, lCfg.TpDbPass, lCfg.DBDataEncoding); err != nil { t.Fatal("Error on ratingDb connection: ", err.Error()) } - if accountDbCsv, err = ConfigureAccountingStorage(lCfg.AccountDBType, lCfg.AccountDBHost, lCfg.AccountDBPort, "7", - lCfg.AccountDBUser, lCfg.AccountDBPass, lCfg.DBDataEncoding); err != nil { + if accountDbCsv, err = ConfigureAccountingStorage(lCfg.DataDbType, lCfg.DataDbHost, lCfg.DataDbPort, "7", + lCfg.DataDbUser, lCfg.DataDbPass, lCfg.DBDataEncoding); err != nil { t.Fatal("Error on ratingDb connection: ", err.Error()) } - if accountDbStor, err = ConfigureAccountingStorage(lCfg.AccountDBType, lCfg.AccountDBHost, lCfg.AccountDBPort, "8", - lCfg.AccountDBUser, lCfg.AccountDBPass, lCfg.DBDataEncoding); err != nil { + if accountDbStor, err = ConfigureAccountingStorage(lCfg.DataDbType, lCfg.DataDbHost, lCfg.DataDbPort, "8", + lCfg.DataDbUser, lCfg.DataDbPass, lCfg.DBDataEncoding); err != nil { t.Fatal("Error on ratingDb connection: ", err.Error()) } - if accountDbApier, err = ConfigureAccountingStorage(lCfg.AccountDBType, lCfg.AccountDBHost, lCfg.AccountDBPort, "9", - lCfg.AccountDBUser, lCfg.AccountDBPass, lCfg.DBDataEncoding); err != nil { + if accountDbApier, err = ConfigureAccountingStorage(lCfg.DataDbType, lCfg.DataDbHost, lCfg.DataDbPort, "9", + lCfg.DataDbUser, lCfg.DataDbPass, lCfg.DBDataEncoding); err != nil { t.Fatal("Error on ratingDb connection: ", err.Error()) } for _, db := range []Storage{ratingDbCsv, ratingDbStor, ratingDbApier, accountDbCsv, accountDbStor, accountDbApier} { diff --git a/engine/storage_redis_local_test.go b/engine/storage_redis_local_test.go index dea1fe0a2..153727d27 100644 --- a/engine/storage_redis_local_test.go +++ b/engine/storage_redis_local_test.go @@ -35,7 +35,7 @@ func TestConnectRedis(t *testing.T) { return } cfg, _ := config.NewDefaultCGRConfig() - rds, err = NewRedisStorage(fmt.Sprintf("%s:%s", cfg.RatingDBHost, cfg.RatingDBPort), 4, cfg.RatingDBPass, cfg.DBDataEncoding) + rds, err = NewRedisStorage(fmt.Sprintf("%s:%s", cfg.TpDbHost, cfg.TpDbPort), 4, cfg.TpDbPass, cfg.DBDataEncoding) if err != nil { t.Fatal("Could not connect to Redis", err.Error()) }