uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-19 22:28:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

Resolved conflicts

Browse Source
This commit is contained in:
Anevo
2018-03-29 06:25:27 -04:00
committed by Dan Christian Bogos
parent 4ff80bb2f2
commit fe9a9c5de4
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
}

4
config/config_json_test.go
View File

@@ -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},
},
}

4
config/config_test.go
View File

@@ -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,

2
loaders/loader.go
View File

@@ -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,

2
loaders/loaders.go
View File

@@ -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 {