From fe9a9c5de4c31711894071c6f69f33d431fe70d8 Mon Sep 17 00:00:00 2001
From: Anevo <cezar.vulcu@itsyscom.com>
Date: Thu, 29 Mar 2018 06:25:27 -0400
Subject: [PATCH] Resolved conflicts

---
 cmd/cgr-engine/cgr-engine.go | 2 +-
 config/config_json_test.go   | 4 ++--
 config/config_test.go        | 4 ++--
 loaders/loader.go            | 2 +-
 loaders/loaders.go           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go
index 3adfdaecc..0eed57533 100644
--- a/cmd/cgr-engine/cgr-engine.go
+++ b/cmd/cgr-engine/cgr-engine.go
@@ -702,7 +702,7 @@ func startFilterService(filterSChan chan *engine.FilterS, cacheS *engine.CacheS,
 // loaderService will start and register APIs for LoaderService if enabled
 func loaderService(cacheS *engine.CacheS, cfg *config.CGRConfig,
 	dm *engine.DataManager, server *utils.Server, exitChan chan bool) {
-	ldrS := loaders.NewLoaderService(dm, cfg.LoaderSCfg(), cfg.DefaultTimezone)
+	ldrS := loaders.NewLoaderService(dm, cfg.LoaderCfg(), cfg.DefaultTimezone)
 	if !ldrS.Enabled() {
 		return
 	}
diff --git a/config/config_json_test.go b/config/config_json_test.go
index b2ca20a08..8f2712bec 100755
--- a/config/config_json_test.go
+++ b/config/config_json_test.go
@@ -820,8 +820,8 @@ func TestDfLoaderJsonCfg(t *testing.T) {
 				Address: utils.StringPointer(utils.MetaInternal),
 			}},
 			Field_separator: utils.StringPointer(","),
-			Tp_in_dir:       utils.StringPointer("/var/spool/cgrates/tploader/in"),
-			Tp_out_dir:      utils.StringPointer("/var/spool/cgrates/tploader/out"),
+			Tp_in_dir:       utils.StringPointer("/var/spool/cgrates/loader/in"),
+			Tp_out_dir:      utils.StringPointer("/var/spool/cgrates/loader/out"),
 			Data:            &[]*LoaderJsonDataType{dataType},
 		},
 	}
diff --git a/config/config_test.go b/config/config_test.go
index 31823fd31..3affa529d 100755
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -930,8 +930,8 @@ func TestLoaderDefaults(t *testing.T) {
 				},
 			},
 			FieldSeparator: ",",
-			TpInDir:        "/var/spool/cgrates/tploader/in",
-			TpOutDir:       "/var/spool/cgrates/tploader/out",
+			TpInDir:        "/var/spool/cgrates/loader/in",
+			TpOutDir:       "/var/spool/cgrates/loader/out",
 			Data: []*LoaderDataType{
 				&LoaderDataType{
 					Type:     utils.MetaAttributes,
diff --git a/loaders/loader.go b/loaders/loader.go
index 3a013fcb0..03585f290 100644
--- a/loaders/loader.go
+++ b/loaders/loader.go
@@ -38,7 +38,7 @@ type openedCSVFile struct {
 	csvRdr   *csv.Reader
 }
 
-func NewLoader(dm *engine.DataManager, cfg *config.LoaderSConfig,
+func NewLoader(dm *engine.DataManager, cfg *config.LoaderConfig,
 	timezone string) (ldr *Loader) {
 	ldr = &Loader{
 		enabled:       cfg.Enabled,
diff --git a/loaders/loaders.go b/loaders/loaders.go
index 568f36367..f44205a06 100644
--- a/loaders/loaders.go
+++ b/loaders/loaders.go
@@ -27,7 +27,7 @@ import (
 	"github.com/cgrates/cgrates/utils"
 )
 
-func NewLoaderService(dm *engine.DataManager, ldrsCfg []*config.LoaderSConfig,
+func NewLoaderService(dm *engine.DataManager, ldrsCfg []*config.LoaderConfig,
 	timezone string) (ldrS *LoaderService) {
 	ldrS = &LoaderService{ldrs: make(map[string]*Loader)}
 	for _, ldrCfg := range ldrsCfg {