From be19930503060c3be77c6c4d9f472d30c414f760 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Tue, 11 Dec 2018 12:56:33 +0200
Subject: [PATCH] Fix apier/v2 integration tests

---
 apier/v2/cdrs_it_test.go                     | 8 ++++----
 data/conf/samples/cdrsv2psql/cdrsv2psql.json | 5 ++++-
 engine/cdrs.go                               | 4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apier/v2/cdrs_it_test.go b/apier/v2/cdrs_it_test.go
index e05a13e4e..c4e338209 100644
--- a/apier/v2/cdrs_it_test.go
+++ b/apier/v2/cdrs_it_test.go
@@ -143,7 +143,7 @@ func testV2CDRsProcessCDR(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply received: ", reply)
 	}
-	time.Sleep(time.Duration(100) * time.Millisecond) // Give time for CDR to be rated
+	time.Sleep(time.Duration(150) * time.Millisecond) // Give time for CDR to be rated
 }
 
 func testV2CDRsGetCdrs(t *testing.T) {
@@ -223,7 +223,7 @@ func testV2CDRsRateCDRs(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply received: ", reply)
 	}
-	time.Sleep(time.Duration(100) * time.Millisecond) // Give time for CDR to be rated
+	time.Sleep(time.Duration(150) * time.Millisecond) // Give time for CDR to be rated
 }
 
 func testV2CDRsGetCdrs2(t *testing.T) {
@@ -291,7 +291,7 @@ func testV2CDRsUsageNegative(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply received: ", reply)
 	}
-	time.Sleep(time.Duration(100) * time.Millisecond) // Give time for CDR to be rated
+	time.Sleep(time.Duration(150) * time.Millisecond) // Give time for CDR to be rated
 
 	var cdrs []*engine.ExternalCDR
 	args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, OriginIDs: []string{"testV2CDRsUsageNegative"}}
@@ -336,7 +336,7 @@ func testV2CDRsUsageNegative(t *testing.T) {
 }
 
 func testV2CDRsKillEngine(t *testing.T) {
-	if err := engine.KillEngine(100); err != nil {
+	if err := engine.KillEngine(*waitRater); err != nil {
 		t.Error(err)
 	}
 }
diff --git a/data/conf/samples/cdrsv2psql/cdrsv2psql.json b/data/conf/samples/cdrsv2psql/cdrsv2psql.json
index cbc3e3762..f8eb58164 100644
--- a/data/conf/samples/cdrsv2psql/cdrsv2psql.json
+++ b/data/conf/samples/cdrsv2psql/cdrsv2psql.json
@@ -4,13 +4,16 @@
 // Used in apier_local_tests
 // Starts rater, cdrs and mediator connecting over internal channel
 
+"general": {
+	"log_level": 7,
+},
+
 "stor_db": {
 	"db_type": "postgres",					// stor database type to use: <mysql|postgres>
 	"db_port": 5432, 						// the port to reach the stordb
 	"db_password": "CGRateS.org"
 },
 
-
 "rals": {
 	"enabled": true,						// enable Rater service: <true|false>
 },
diff --git a/engine/cdrs.go b/engine/cdrs.go
index b0130f021..57754bce2 100644
--- a/engine/cdrs.go
+++ b/engine/cdrs.go
@@ -762,7 +762,9 @@ func (cdrS *CdrServer) attrSProcessEvent(cgrEv *utils.CGREvent) (err error) {
 // V2ProcessCDR will process the CDR out of CGREvent
 func (cdrS *CdrServer) V2ProcessCDR(cgrEv *utils.CGREvent, reply *string) (err error) {
 	if cdrS.attrS != nil {
-		cdrS.attrSProcessEvent(cgrEv)
+		if err := cdrS.attrSProcessEvent(cgrEv); err != nil {
+			return utils.NewErrServerError(err)
+		}
 	}
 	rawCDR, err := NewMapEvent(cgrEv.Event).AsCDR(cdrS.cgrCfg, cgrEv.Tenant, cdrS.Timezone())
 	if err != nil {