From 811dfbe20f26a8ff9c781e4e8991dba59bbd3e27 Mon Sep 17 00:00:00 2001
From: TeoV <teofil.voivozeanu@itsyscom.com>
Date: Mon, 26 Nov 2018 05:43:51 -0500
Subject: [PATCH] cgr-loader default path take now correctly

---
 cmd/cgr-loader/cgr-loader.go | 16 +++++++++-------
 config/config_defaults.go    |  2 +-
 config/config_json_test.go   |  2 +-
 config/config_test.go        |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go
index 4d9ffb5b7..cd5af0cd6 100755
--- a/cmd/cgr-loader/cgr-loader.go
+++ b/cmd/cgr-loader/cgr-loader.go
@@ -118,6 +118,7 @@ func main() {
 		}
 	}
 
+	// Data for DataDB
 	if *dataDBType != dfltCfg.DataDbCfg().DataDbType {
 		ldrCfg.DataDbCfg().DataDbType = *dataDBType
 	}
@@ -146,6 +147,11 @@ func main() {
 		ldrCfg.DataDbCfg().DataDbSentinelName = *dbRedisSentinel
 	}
 
+	if *dbDataEncoding != dfltCfg.GeneralCfg().DBDataEncoding {
+		ldrCfg.GeneralCfg().DBDataEncoding = *dbDataEncoding
+	}
+
+	// Data for StorDB
 	if *storDBType != dfltCfg.StorDbCfg().StorDBType {
 		ldrCfg.StorDbCfg().StorDBType = *storDBType
 	}
@@ -166,19 +172,15 @@ func main() {
 		ldrCfg.StorDbCfg().StorDBUser = *storDBUser
 	}
 
-	if *storDBPasswd != "" {
+	if *storDBPasswd != dfltCfg.StorDbCfg().StorDBPass {
 		ldrCfg.StorDbCfg().StorDBPass = *storDBPasswd
 	}
 
-	if *dbDataEncoding != "" {
-		ldrCfg.GeneralCfg().DBDataEncoding = *dbDataEncoding
-	}
-
-	if *tpid != "" {
+	if *tpid != dfltCfg.LoaderCgrCfg().DataPath {
 		ldrCfg.LoaderCgrCfg().TpID = *tpid
 	}
 
-	if *dataPath != "" {
+	if *dataPath != dfltCfg.LoaderCgrCfg().DataPath {
 		ldrCfg.LoaderCgrCfg().DataPath = *dataPath
 	}
 
diff --git a/config/config_defaults.go b/config/config_defaults.go
index f69b6b0b6..72aa889dc 100755
--- a/config/config_defaults.go
+++ b/config/config_defaults.go
@@ -661,7 +661,7 @@ const CGRATES_CFG_JSON = `
 
 "loader": {									// loader for tariff plans out of .csv files
 	"tpid": "",								// tariff plan identificator
-	"data_path": "",						// path towards tariff plan files
+	"data_path": "./",						// path towards tariff plan files
 	"disable_reverse": false,				// disable reverse computing
 	"field_separator": ",",					// separator used in case of csv files
 	"caches_conns":[						// addresses towards cacheS components for reloads
diff --git a/config/config_json_test.go b/config/config_json_test.go
index c46ffb4f5..2897ec1b5 100755
--- a/config/config_json_test.go
+++ b/config/config_json_test.go
@@ -1331,7 +1331,7 @@ func TestDfDispatcherSJsonCfg(t *testing.T) {
 func TestDfLoaderCfg(t *testing.T) {
 	eCfg := &LoaderCfgJson{
 		Tpid:            utils.StringPointer(""),
-		Data_path:       utils.StringPointer(""),
+		Data_path:       utils.StringPointer("./"),
 		Disable_reverse: utils.BoolPointer(false),
 		Field_separator: utils.StringPointer(","),
 		Caches_conns: &[]*HaPoolJsonCfg{
diff --git a/config/config_test.go b/config/config_test.go
index 64ccfbc52..35a1847f9 100755
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -1464,7 +1464,7 @@ func TestCgrCfgJSONDefaultDispatcherSCfg(t *testing.T) {
 func TestCgrLoaderCfgDefault(t *testing.T) {
 	eLdrCfg := &LoaderCgrCfg{
 		TpID:           "",
-		DataPath:       "",
+		DataPath:       "./",
 		DisableReverse: false,
 		FieldSeparator: rune(','),
 		CachesConns: []*HaPoolConfig{