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

Dbdefaults mishandled, removed unnecessary print from cgr-engine.

Browse Source
This commit is contained in:
Anevo
2018-05-25 10:33:26 -04:00
committed by Dan Christian Bogos
parent 5586633344
commit 0a5d1017e1
3 changed files with 87 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/cgr-engine/cgr-engine.go
View File

@@ -837,7 +837,6 @@ func main() {
if *nodeID != "" {
cfg.NodeID = *nodeID
}
fmt.Printf("\ncfg.DigestSeparator %+v,\n cfg.DigestEqual %+v\n", cfg.DigestSeparator, cfg.DigestEqual)
config.SetCgrConfig(cfg) // Share the config object
// init syslog

14
config/config.go
View File

@@ -328,7 +328,7 @@ type CGRConfig struct {
CDRSThresholdSConns []*HaPoolConfig // address where to reach the thresholds service
CDRSStatSConns []*HaPoolConfig
CDRSOnlineCDRExports []string // list of CDRE templates to use for real-time CDR exports
CDRStatsEnabled bool // Enable CDR Stats servicedigest_separator = ","
CDRStatsEnabled bool // Enable CDR Stats service
CDRStatsSaveInterval time.Duration // Save interval duration
CdreProfiles map[string]*CdreConfig
CdrcProfiles map[string][]*CdrcConfig // Number of CDRC instances running imports, format map[dirPath][]{Configs}
@@ -888,7 +888,11 @@ func (self *CGRConfig) loadFromJsonCfg(jsnCfg *CgrJsonCfg) (err error) {
self.DataDbHost = *jsnDataDbCfg.Db_host
}
if jsnDataDbCfg.Db_port != nil {
self.DataDbPort = strconv.Itoa(*jsnDataDbCfg.Db_port)
port := strconv.Itoa(*jsnDataDbCfg.Db_port)
if port == "-1" {
port = utils.MetaDynamic
}
self.DataDbPort = NewDbDefaults().DBPort(*jsnDataDbCfg.Db_type, port)
}
if jsnDataDbCfg.Db_name != nil {
self.DataDbName = *jsnDataDbCfg.Db_name
@@ -912,7 +916,11 @@ func (self *CGRConfig) loadFromJsonCfg(jsnCfg *CgrJsonCfg) (err error) {
self.StorDBHost = *jsnStorDbCfg.Db_host
}
if jsnStorDbCfg.Db_port != nil {
self.StorDBPort = strconv.Itoa(*jsnStorDbCfg.Db_port)
port := strconv.Itoa(*jsnStorDbCfg.Db_port)
if port == "-1" {
port = utils.MetaDynamic
}
self.StorDBPort = NewDbDefaults().DBPort(*jsnStorDbCfg.Db_type, port)
}
if jsnStorDbCfg.Db_name != nil {
self.StorDBName = *jsnStorDbCfg.Db_name

76
config/config_test.go
View File

@@ -65,6 +65,76 @@ func TestCgrCfgLoadWithDefaults(t *testing.T) {
}
}
func TestCgrCfgDataDBPortWithoutDynamic(t *testing.T) {
JSN_CFG := `
{
"data_db": {
"db_type": "mongo",
}
}`
if cgrCfg, err := NewCGRConfigFromJsonStringWithDefaults(JSN_CFG); err != nil {
t.Error(err)
} else if cgrCfg.DataDbType != utils.MONGO {
t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbType, utils.MONGO)
} else if cgrCfg.DataDbPort != "6379" {
t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbPort, "6379")
}
}
func TestCgrCfgDataDBPortWithDymanic(t *testing.T) {
JSN_CFG := `
{
"data_db": {
"db_type": "mongo",
"db_port": -1,
}
}`
if cgrCfg, err := NewCGRConfigFromJsonString(JSN_CFG); err != nil {
t.Error(err)
} else if cgrCfg.DataDbType != utils.MONGO {
t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbType, utils.MONGO)
} else if cgrCfg.DataDbPort != "27017" {
t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbPort, "27017")
}
}
func TestCgrCfgStorDBPortWithoutDynamic(t *testing.T) {
JSN_CFG := `
{
"stor_db": {
"db_type": "mongo",
}
}`
if cgrCfg, err := NewCGRConfigFromJsonStringWithDefaults(JSN_CFG); err != nil {
t.Error(err)
} else if cgrCfg.StorDBType != utils.MONGO {
t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDBType, utils.MONGO)
} else if cgrCfg.StorDBPort != "3306" {
t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDBPort, "3306")
}
}
func TestCgrCfgStorDBPortWithDymanic(t *testing.T) {
JSN_CFG := `
{
"stor_db": {
"db_type": "mongo",
"db_port": -1,
}
}`
if cgrCfg, err := NewCGRConfigFromJsonString(JSN_CFG); err != nil {
t.Error(err)
} else if cgrCfg.StorDBType != utils.MONGO {
t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDBType, utils.MONGO)
} else if cgrCfg.StorDBPort != "27017" {
t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDBPort, "27017")
}
}
func TestCgrCfgCDRC(t *testing.T) {
JSN_RAW_CFG := `
{
@@ -217,6 +287,12 @@ func TestCgrCfgJSONDefaultsGeneral(t *testing.T) {
if cgrCfg.LogLevel != 6 {
t.Error(cgrCfg.LogLevel)
}
if cgrCfg.DigestSeparator != "," {
t.Error(cgrCfg.DigestSeparator)
}
if cgrCfg.DigestEqual != ":" {
t.Error(cgrCfg.DigestEqual)
}
}
func TestCgrCfgJSONDefaultsListen(t *testing.T) {