diff --git a/data/conf/samples/ees/cgrates.json b/data/conf/samples/ees/cgrates.json index 16bd700f5..c6167e40a 100644 --- a/data/conf/samples/ees/cgrates.json +++ b/data/conf/samples/ees/cgrates.json @@ -330,7 +330,7 @@ "elsPipeline": "", "require_alias": "", "elsRouting": "", - "elsTimeout": 0, + "elsTimeout": "0", //"elsVersion": 0, "elsVersionType": "", "elsWaitForActiveShards": "", @@ -383,8 +383,8 @@ "sqlDBName": "cgrates2", // if dbName is not present "cgrates" will be used as default "sqlTableName": "expTable", // tableName is mandatory in opts for sql exporter "postgresSSLMode": "disable", - "sqlMaxIdleConns": "10", - "sqlMaxOpenConns": "100", + "sqlMaxIdleConns": 10, + "sqlMaxOpenConns": 100, "sqlConnMaxLifetime": "0", }, "fields":[ // in case that the path is *exp.*row user must complete all the fields one to one with his sql schema in the correct order @@ -403,8 +403,8 @@ "sqlDBName": "cgrates2", "sqlTableName": "expTable", "postgresSSLMode": "disable", - "sqlMaxIdleConns": "10", - "sqlMaxOpenConns": "100", + "sqlMaxIdleConns": 10, + "sqlMaxOpenConns": 100, "sqlConnMaxLifetime": "0", }, "fields":[ // the path constains *exp.columnName diff --git a/ees/libactions.go b/ees/libactions.go index 5f2c29c90..5431a21c6 100644 --- a/ees/libactions.go +++ b/ees/libactions.go @@ -97,6 +97,7 @@ func postEvent(_ *engine.Account, a *engine.Action, _ engine.Actions, _ *engine. ExportPath: a.ExtraParameters, Attempts: config.CgrConfig().GeneralCfg().PosterAttempts, FailedPostsDir: config.CgrConfig().GeneralCfg().FailedPostsDir, + Opts: &config.EventExporterOpts{}, }, config.CgrConfig(), nil, nil) if err != nil { return err diff --git a/ees/poster_it_test.go b/ees/poster_it_test.go index 0912292b6..79e61158e 100644 --- a/ees/poster_it_test.go +++ b/ees/poster_it_test.go @@ -73,6 +73,7 @@ func TestHttpJsonPoster(t *testing.T) { ExportPath: "http://localhost:8080/invalid", Attempts: 3, FailedPostsDir: "/tmp", + Opts: &config.EventExporterOpts{}, }, config.CgrConfig(), nil, nil) if err != nil { t.Error(err) @@ -110,6 +111,7 @@ func TestHttpBytesPoster(t *testing.T) { ExportPath: "http://localhost:8080/invalid", Attempts: 3, FailedPostsDir: "/tmp", + Opts: &config.EventExporterOpts{}, }, config.CgrConfig(), nil, nil) if err != nil { t.Error(err) diff --git a/ers/ers_it_test.go b/ers/ers_it_test.go index dd6bd367c..d0e55e47a 100644 --- a/ers/ers_it_test.go +++ b/ers/ers_it_test.go @@ -1415,7 +1415,6 @@ func TestErsOnEvictedDumpToJSONInvalidPath(t *testing.T) { if !strings.Contains(rcvLog, expLog) { t.Errorf("expected <%+v> to be included in: <%+v>", expLog, rcvLog) } - // fmt.Println(rcvLog) utils.Logger.SetLogLevel(0) if err := os.RemoveAll(dirPath); err != nil { t.Error(err) diff --git a/ers/sql_it_test.go b/ers/sql_it_test.go index c88f59c2c..e34e0f94c 100644 --- a/ers/sql_it_test.go +++ b/ers/sql_it_test.go @@ -660,7 +660,7 @@ func TestSQLSetURLError2(t *testing.T) { rdrErr: nil, cap: nil, } - err := testSQLEventReader.setURL("*mysql://cgrates:CGRateS.org@127.0.0.1:3306", "http://user^:passwo^rd@foo.com/", nil) + err := testSQLEventReader.setURL("*mysql://cgrates:CGRateS.org@127.0.0.1:3306", "http://user^:passwo^rd@foo.com/", &config.EventReaderOpts{}) expected := `parse "http://user^:passwo^rd@foo.com/": net/url: invalid userinfo` if err == nil || err.Error() != expected { t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, err)