Add check for schedCDRSConns

This commit is contained in:
TeoV
2018-09-12 04:35:42 -04:00
committed by Dan Christian Bogos
parent 3759993f99
commit a0254287ae
4 changed files with 14 additions and 12 deletions

View File

@@ -722,6 +722,14 @@ func (self *CGRConfig) checkConfigSanity() error {
utils.DispatcherS, self.dispatcherSCfg.DispatchingStrategy)
}
}
// Scheduler check connection with CDR Server
if len(self.schedulerCfg.CDRsConns) != 0 {
for _, connCfg := range self.schedulerCfg.CDRsConns {
if connCfg.Address == utils.MetaInternal && !self.CDRSEnabled {
return errors.New("CDR Server not enabled but requested by Scheduler")
}
}
}
return nil
}

View File

@@ -103,10 +103,8 @@ const CGRATES_CFG_JSON = `
"scheduler": {
"enabled": false, // start Scheduler service: <true|false>
"cdrs_conns": [
{"address": "*internal"} // address where to reach CDR Server, empty to disable CDR capturing <*internal|x.y.z.y:1234>
],
"enabled": false, // start Scheduler service: <true|false>
"cdrs_conns": [], // address where to reach CDR Server, empty to disable CDR capturing <*internal|x.y.z.y:1234>
},

View File

@@ -251,11 +251,8 @@ func TestDfRalsJsonCfg(t *testing.T) {
func TestDfSchedulerJsonCfg(t *testing.T) {
eCfg := &SchedulerJsonCfg{
Enabled: utils.BoolPointer(false),
Cdrs_conns: &[]*HaPoolJsonCfg{
&HaPoolJsonCfg{
Address: utils.StringPointer("*internal"),
}},
Enabled: utils.BoolPointer(false),
Cdrs_conns: &[]*HaPoolJsonCfg{},
}
if cfg, err := dfCgrJsonCfg.SchedulerJsonCfg(); err != nil {
t.Error(err)

View File

@@ -510,9 +510,8 @@ func TestCgrCfgJSONDefaultsRALs(t *testing.T) {
func TestCgrCfgJSONDefaultsScheduler(t *testing.T) {
eSchedulerCfg := &SchedulerCfg{
Enabled: false,
CDRsConns: []*HaPoolConfig{
&HaPoolConfig{Address: "*internal"}},
Enabled: false,
CDRsConns: []*HaPoolConfig{},
}
if !reflect.DeepEqual(cgrCfg.schedulerCfg, eSchedulerCfg) {