diff --git a/config/eescfg_test.go b/config/eescfg_test.go index 9b47daa04..ef11c7917 100644 --- a/config/eescfg_test.go +++ b/config/eescfg_test.go @@ -425,5 +425,4 @@ func TestEventExporterSameID(t *testing.T) { } else if !reflect.DeepEqual(expectedEEsCfg, cfg.eesCfg) { t.Errorf("Expected: %+v ,\n recived: %+v", utils.ToJSON(expectedEEsCfg), utils.ToJSON(cfg.eesCfg)) } - } diff --git a/config/erscfg_test.go b/config/erscfg_test.go index c18c2bad7..317fd4e68 100644 --- a/config/erscfg_test.go +++ b/config/erscfg_test.go @@ -387,7 +387,7 @@ func TestERsCfgAsMapInterface(t *testing.T) { "xml_root_path": []string{""}, "cache_dump_fields": []map[string]interface{}{}, "concurrent_requests": 1024, - "db_type": "*none", + "type": "*none", "failed_calls_prefix": "", "field_separator": ",", utils.HeaderDefCharCfg: ":", @@ -408,7 +408,7 @@ func TestERsCfgAsMapInterface(t *testing.T) { { "cache_dump_fields": []map[string]interface{}{}, "concurrent_requests": 1024, - "db_type": "*file_csv", + "type": "*file_csv", "failed_calls_prefix": "", "field_separator": ",", utils.HeaderDefCharCfg: ":", diff --git a/config/stordbcfg.go b/config/stordbcfg.go index 54410785b..fca0cf560 100644 --- a/config/stordbcfg.go +++ b/config/stordbcfg.go @@ -138,12 +138,12 @@ func (dbcfg *StorDbCfg) AsMapInterface() map[string]interface{} { dbPort, _ := strconv.Atoi(dbcfg.Port) return map[string]interface{}{ - utils.TypeCfg: utils.Meta + dbcfg.Type, - utils.HostCfg: dbcfg.Host, - utils.PortCfg: dbPort, - utils.NameCfg: dbcfg.Name, - utils.UserCfg: dbcfg.User, - utils.PasswordCfg: dbcfg.Password, + utils.DataDbTypeCfg: utils.Meta + dbcfg.Type, + utils.DataDbHostCfg: dbcfg.Host, + utils.DataDbPortCfg: dbPort, + utils.DataDbNameCfg: dbcfg.Name, + utils.DataDbUserCfg: dbcfg.User, + utils.DataDbPassCfg: dbcfg.Password, utils.MaxOpenConnsCfg: dbcfg.MaxOpenConns, utils.MaxIdleConnsCfg: dbcfg.MaxIdleConns, utils.ConnMaxLifetimeCfg: dbcfg.ConnMaxLifetime, diff --git a/utils/consts.go b/utils/consts.go index f8e2acd8e..535c00ce9 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -1708,12 +1708,7 @@ const ( // StorDbCfg const ( - TypeCfg = "db_type" - HostCfg = "db_host" - PortCfg = "db_port" - NameCfg = "db_name" - UserCfg = "db_user" - PasswordCfg = "db_password" + TypeCfg = "type" MaxOpenConnsCfg = "max_open_conns" MaxIdleConnsCfg = "max_idle_conns" ConnMaxLifetimeCfg = "conn_max_lifetime"