From a0254287aef5c7953f17e494491613033aa83dfd Mon Sep 17 00:00:00 2001
From: TeoV <teofil.voivozeanu@itsyscom.com>
Date: Wed, 12 Sep 2018 04:35:42 -0400
Subject: [PATCH] Add check for schedCDRSConns

---
 config/config.go           | 8 ++++++++
 config/config_defaults.go  | 6 ++----
 config/config_json_test.go | 7 ++-----
 config/config_test.go      | 5 ++---
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/config/config.go b/config/config.go
index 05ff822d4..133983dc0 100755
--- a/config/config.go
+++ b/config/config.go
@@ -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
 }
 
diff --git a/config/config_defaults.go b/config/config_defaults.go
index 64759e9a9..d914707ec 100755
--- a/config/config_defaults.go
+++ b/config/config_defaults.go
@@ -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>
 },
 
 
diff --git a/config/config_json_test.go b/config/config_json_test.go
index 6bc84c931..376409221 100755
--- a/config/config_json_test.go
+++ b/config/config_json_test.go
@@ -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)
diff --git a/config/config_test.go b/config/config_test.go
index 2b2355029..3e9788505 100755
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -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) {