diff --git a/analyzers/analyzers_it_test.go b/analyzers/analyzers_it_test.go index a75dcefb9..1b9e2e114 100644 --- a/analyzers/analyzers_it_test.go +++ b/analyzers/analyzers_it_test.go @@ -75,7 +75,6 @@ func newRPCClient(cfg *config.ListenCfg) (c *rpc.Client, err error) { //Test start here func TestAnalyzerSIT(t *testing.T) { - for _, stest := range sTestsAlsPrf { t.Run("TestAnalyzerSIT", stest) } @@ -220,4 +219,7 @@ func testAnalyzerSKillEngine(t *testing.T) { if err := engine.KillEngine(100); err != nil { t.Error(err) } + if err := os.RemoveAll(anzCfg.AnalyzerSCfg().DBPath); err != nil { + t.Fatal(err) + } } diff --git a/analyzers/analyzers_test.go b/analyzers/analyzers_test.go index 6a1f120a5..6565dfea5 100644 --- a/analyzers/analyzers_test.go +++ b/analyzers/analyzers_test.go @@ -63,6 +63,9 @@ func TestNewAnalyzerService(t *testing.T) { t.Fatal(err) } anz.db.Close() + if err := os.RemoveAll(cfg.AnalyzerSCfg().DBPath); err != nil { + t.Fatal(err) + } } func TestAnalyzerSLogTraffic(t *testing.T) { @@ -116,6 +119,9 @@ func TestAnalyzerSLogTraffic(t *testing.T) { if err = anz.clenaUp(); err != bleve.ErrorIndexClosed { t.Errorf("Expected error: %v,received: %+v", bleve.ErrorIndexClosed, err) } + if err := os.RemoveAll(cfg.AnalyzerSCfg().DBPath); err != nil { + t.Fatal(err) + } } func TestAnalyzersDeleteHits(t *testing.T) { @@ -138,6 +144,9 @@ func TestAnalyzersDeleteHits(t *testing.T) { if err = anz.deleteHits(search.DocumentMatchCollection{&search.DocumentMatch{}}); err != utils.ErrPartiallyExecuted { t.Errorf("Expected error: %v,received: %+v", utils.ErrPartiallyExecuted, err) } + if err := os.RemoveAll(cfg.AnalyzerSCfg().DBPath); err != nil { + t.Fatal(err) + } } func TestAnalyzersListenAndServe(t *testing.T) { @@ -173,6 +182,9 @@ func TestAnalyzersListenAndServe(t *testing.T) { anz.db.Close() }() anz.ListenAndServe(make(chan bool)) + if err := os.RemoveAll(cfg.AnalyzerSCfg().DBPath); err != nil { + t.Fatal(err) + } } func TestAnalyzersV1Search(t *testing.T) { @@ -289,4 +301,7 @@ func TestAnalyzersV1Search(t *testing.T) { if err = anz.V1StringQuery("RequestEncoding:*gob", &reply); err != bleve.ErrorIndexClosed { t.Errorf("Expected error: %v,received: %+v", bleve.ErrorIndexClosed, err) } + if err := os.RemoveAll(cfg.AnalyzerSCfg().DBPath); err != nil { + t.Fatal(err) + } } diff --git a/analyzers/codec_test.go b/analyzers/codec_test.go index 988292676..772eda32f 100644 --- a/analyzers/codec_test.go +++ b/analyzers/codec_test.go @@ -97,4 +97,7 @@ func TestNewServerCodec(t *testing.T) { } else if cnt != 1 { t.Errorf("Expected only one document received:%v", cnt) } + if err := os.RemoveAll(cfg.AnalyzerSCfg().DBPath); err != nil { + t.Fatal(err) + } } diff --git a/analyzers/connector_test.go b/analyzers/connector_test.go index a412a42e7..149c29a05 100644 --- a/analyzers/connector_test.go +++ b/analyzers/connector_test.go @@ -62,4 +62,7 @@ func TestNewAnalyzeConnector(t *testing.T) { } else if cnt != 1 { t.Errorf("Expected only one document received:%v", cnt) } + if err := os.RemoveAll(cfg.AnalyzerSCfg().DBPath); err != nil { + t.Fatal(err) + } } diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index 718a66973..33ab52da8 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -2059,7 +2059,7 @@ func testApierReplayFldPosts(t *testing.T) { ev := &engine.ExportEvents{ Path: "http://localhost:2081", Format: utils.MetaHTTPjson, - Events: []interface{}{bev}, + Events: []interface{}{&engine.HTTPPosterRequest{Body: bev, Header: http.Header{"Content-Type": []string{"application/json"}}}}, } fileName := "act>*http_post|63bed4ea-615e-4096-b1f4-499f64f29b28.json" diff --git a/dispatcherh/dispatcherh_it_test.go b/dispatcherh/dispatcherh_it_test.go index f35ed7f58..9dc6e481a 100644 --- a/dispatcherh/dispatcherh_it_test.go +++ b/dispatcherh/dispatcherh_it_test.go @@ -52,10 +52,10 @@ var ( testDsphInitDB, testDsphStartEngine, testDsphLoadData, - // testDsphBeforeDsphStart, - // testDsphStartAll2, - // testDsphStartAll, - // testDsphStopEngines, + testDsphBeforeDsphStart, + testDsphStartAll2, + testDsphStartAll, + testDsphStopEngines, testDsphStopDispatcher, } ) diff --git a/dispatcherh/libdispatcherh_test.go b/dispatcherh/libdispatcherh_test.go index 43fa529f8..be2e3ba0a 100644 --- a/dispatcherh/libdispatcherh_test.go +++ b/dispatcherh/libdispatcherh_test.go @@ -240,7 +240,19 @@ func TestRegister(t *testing.T) { } engine.NewConnManager(errCfg, map[string]chan rpcclient.ClientConnector{}) errCfg.CacheCfg().Partitions[utils.CacheDispatcherHosts].Replicate = true - errCfg.CacheCfg().ReplicationConns = []string{"*localhost"} + errCfg.RPCConns()["errCon"] = &config.RPCConn{ + Strategy: utils.MetaFirst, + PoolSize: 1, + Conns: []*config.RemoteHost{ + { + Address: "127.0.0.1:5612", + Transport: "*json", + Synchronous: false, + TLS: false, + }, + }, + } + errCfg.CacheCfg().ReplicationConns = []string{"errCon"} engine.SetCache(engine.NewCacheS(errCfg, nil)) req.Body = ioutil.NopCloser(bytes.NewBuffer(uargsJSON)) if _, err := register(req); err != utils.ErrPartiallyExecuted { diff --git a/ees/httppost.go b/ees/httppost.go index e9ba2d338..2ac07b161 100644 --- a/ees/httppost.go +++ b/ees/httppost.go @@ -115,7 +115,7 @@ func (httpPost *HTTPPost) ExportEvent(cgrEv *utils.CGREventWithOpts) (err error) httpPost.cgrCfg.GeneralCfg().FailedPostsDir != utils.META_NONE { engine.AddFailedPost(httpPost.cgrCfg.EEsCfg().Exporters[httpPost.cfgIdx].ExportPath, httpPost.cgrCfg.EEsCfg().Exporters[httpPost.cfgIdx].Type, utils.EventExporterS, - engine.HTTPPosterRequest{ + &engine.HTTPPosterRequest{ Header: hdr, Body: urlVals, }, httpPost.cgrCfg.EEsCfg().Exporters[httpPost.cfgIdx].Opts) diff --git a/engine/caches.go b/engine/caches.go index d1b8c4984..f279aec1f 100644 --- a/engine/caches.go +++ b/engine/caches.go @@ -78,6 +78,8 @@ func init() { gob.Register(new(StatSum)) gob.Register(new(StatAverage)) gob.Register(new(StatDistinct)) + + gob.Register(new(HTTPPosterRequest)) } //SetCache shared the cache from other subsystems diff --git a/engine/libcdre.go b/engine/libcdre.go index 350df9150..0b1c98c80 100644 --- a/engine/libcdre.go +++ b/engine/libcdre.go @@ -164,7 +164,7 @@ func (expEv *ExportEvents) ReplayFailedPosts(attempts int) (failedEvents *Export return expEv, err } for _, ev := range expEv.Events { - req := ev.(HTTPPosterRequest) + req := ev.(*HTTPPosterRequest) err = pstr.PostValues(req.Body, req.Header) if err != nil { failedEvents.AddEvent(req) diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go index 297f4aa47..45fbfc76d 100644 --- a/services/dnsagent_it_test.go +++ b/services/dnsagent_it_test.go @@ -52,7 +52,7 @@ func TestDNSAgentReload(t *testing.T) { db := NewDataDBService(cfg, nil) anz := NewAnalyzerService(cfg, server, engineShutdown, make(chan rpcclient.ClientConnector, 1)) sS := NewSessionService(cfg, db, server, make(chan rpcclient.ClientConnector, 1), - engineShutdown, nil, utils.NewConReqs(0, ""), anz) + engineShutdown, nil, nil, anz) srv := NewDNSAgent(cfg, filterSChan, engineShutdown, nil) engine.NewConnManager(cfg, nil) srvMngr.AddServices(srv, sS, diff --git a/services/ers_it_test.go b/services/ers_it_test.go index eb001fc5e..02d53947c 100644 --- a/services/ers_it_test.go +++ b/services/ers_it_test.go @@ -56,7 +56,7 @@ func TestEventReaderSReload(t *testing.T) { srvMngr := servmanager.NewServiceManager(cfg, engineShutdown) anz := NewAnalyzerService(cfg, server, engineShutdown, make(chan rpcclient.ClientConnector, 1)) db := NewDataDBService(cfg, nil) - sS := NewSessionService(cfg, db, server, make(chan rpcclient.ClientConnector, 1), engineShutdown, nil, utils.NewConReqs(0, ""), anz) + sS := NewSessionService(cfg, db, server, make(chan rpcclient.ClientConnector, 1), engineShutdown, nil, nil, anz) attrS := NewEventReaderService(cfg, filterSChan, engineShutdown, nil) engine.NewConnManager(cfg, nil) srvMngr.AddServices(attrS, sS, diff --git a/services/sessions_it_test.go b/services/sessions_it_test.go index 6f168b9e2..08c71291f 100644 --- a/services/sessions_it_test.go +++ b/services/sessions_it_test.go @@ -79,7 +79,7 @@ func TestSessionSReload(t *testing.T) { cdrS := NewCDRServer(cfg, db, stordb, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz) - srv := NewSessionService(cfg, db, server, make(chan rpcclient.ClientConnector, 1), engineShutdown, nil, utils.NewConReqs(0, ""), anz) + srv := NewSessionService(cfg, db, server, make(chan rpcclient.ClientConnector, 1), engineShutdown, nil, nil, anz) engine.NewConnManager(cfg, nil) srvMngr.AddServices(srv, chrS, schS, ralS, cdrS, NewLoaderService(cfg, db, filterSChan, server, engineShutdown, make(chan rpcclient.ClientConnector, 1), nil, anz), db, stordb) diff --git a/services/sipagent_it_test.go b/services/sipagent_it_test.go index 1f97a562d..4bfc88393 100644 --- a/services/sipagent_it_test.go +++ b/services/sipagent_it_test.go @@ -52,7 +52,7 @@ func TestSIPAgentReload(t *testing.T) { db := NewDataDBService(cfg, nil) anz := NewAnalyzerService(cfg, server, engineShutdown, make(chan rpcclient.ClientConnector, 1)) sS := NewSessionService(cfg, db, server, make(chan rpcclient.ClientConnector, 1), - engineShutdown, nil, utils.NewConReqs(0, ""), anz) + engineShutdown, nil, nil, anz) srv := NewSIPAgent(cfg, filterSChan, engineShutdown, nil) engine.NewConnManager(cfg, nil) srvMngr.AddServices(srv, sS,