uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1830 from adragusin/master

Browse Source 
Updated test in processEvent
This commit is contained in:
Dan Christian Bogos
2019-12-18 12:20:28 +01:00
committed by GitHub
parent 4970903d3b 7789c60137
commit ef62eab470
6 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/conf/samples/cdrsv1processevent/cgrates.json
View File

@@ -5,6 +5,7 @@
"general": {
"log_level": 7,
"poster_attempts": 1,
},
"data_db":{
@@ -27,8 +28,10 @@
"cdre":{
"aws_test_file": {
"export_format": "*amqpv1_json_map",
"export_path": "amqps://guest:guest@localhost:25672/?queue_id=cgrates_cdrswrong",
"export_format": "*amqp_json_map",
"export_path": "amqps://guest:guest@localhost:256733/",
"attempts": 1, // export attempts
"synchronous": true, // block processing until export has a result
"content_fields": [
{"tag": "CGRID", "type": "*composed", "value": "~CGRID", "field_id": "CGRID"},
],

11
data/conf/samples/cdrsv1processeventmongo/cgrates.json
View File

@@ -3,6 +3,11 @@
//
// Used in general_tests
"general": {
"log_level": 7,
"poster_attempts": 1,
},
"data_db": {
"db_type": "mongo",
"db_name": "10",
@@ -27,8 +32,10 @@
"cdre":{
"aws_test_file": {
"export_format": "*amqpv1_json_map",
"export_path": "amqps://guest:guest@localhost:25672/?queue_id=cgrates_cdrswrong",
"export_format": "*amqp_json_map",
"export_path": "amqps://guest:guest@localhost:256733/",
"attempts": 1, // export attempts
"synchronous": true, // block processing until export has a result
"content_fields": [
{"tag": "CGRID", "type": "*composed", "value": "~CGRID", "field_id": "CGRID"},
],

10
data/conf/samples/cdrsv1processeventmysql/cgrates.json
View File

@@ -3,6 +3,10 @@
//
// Used in general_tests
"general": {
"log_level": 7,
"poster_attempts": 1,
},
"data_db": { // database used to store runtime data (eg: accounts, cdr stats)
"db_type": "redis", // data_db type: <redis|mongo>
@@ -25,8 +29,10 @@
"cdre":{
"aws_test_file": {
"export_format": "*amqpv1_json_map",
"export_path": "amqps://guest:guest@localhost:25672/?queue_id=cgrates_cdrswrong",
"export_format": "*amqp_json_map",
"export_path": "amqps://guest:guest@localhost:256733/",
"attempts": 1, // export attempts
"synchronous": true, // block processing until export has a result
"content_fields": [
{"tag": "CGRID", "type": "*composed", "value": "~CGRID", "field_id": "CGRID"},
],

4
engine/poster.go
View File

@@ -24,8 +24,8 @@ import (
"path"
"strings"
"sync"
"time"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/guardian"
"github.com/cgrates/cgrates/utils"
)
@@ -78,7 +78,7 @@ func writeToFile(fileDir, fileName string, content []byte) (err error) {
_, err = fileOut.Write(content)
fileOut.Close()
return nil, err
}, time.Duration(2*time.Second), utils.FileLockPrefix+fallbackFilePath)
}, config.CgrConfig().GeneralCfg().LockingTimeout, utils.FileLockPrefix+fallbackFilePath)
return
}

8
engine/pstr_amqp.go
View File

@@ -95,7 +95,9 @@ func (pstr *AMQPPoster) Post(content []byte, fallbackFileName, _ string) (err er
if chn, err = pstr.newPostChannel(); err == nil {
break
}
time.Sleep(time.Duration(fib()) * time.Second)
if i+1 < pstr.attempts {
time.Sleep(time.Duration(fib()) * time.Second)
}
}
if err != nil {
if fallbackFileName != utils.META_NONE {
@@ -117,7 +119,9 @@ func (pstr *AMQPPoster) Post(content []byte, fallbackFileName, _ string) (err er
}); err == nil {
break
}
time.Sleep(time.Duration(fib()) * time.Second)
if i+1 < pstr.attempts {
time.Sleep(time.Duration(fib()) * time.Second)
}
}
if err != nil && fallbackFileName != utils.META_NONE {
err = writeToFile(pstr.fallbackFileDir, fallbackFileName, content)

11
general_tests/cdrs_processevent_it_test.go
View File

@@ -494,7 +494,7 @@ func testV1CDRsProcessEventThreshold(t *testing.T) {
utils.OriginID: "testV2CDRsProcessCDRWithThreshold",
utils.OriginHost: "OriginHost6",
utils.Source: "testV2CDRsProcessCDRWithThreshold",
utils.RequestType: utils.META_PREPAID,
utils.RequestType: utils.META_PSEUDOPREPAID,
utils.Category: "call",
utils.Account: "1005",
utils.Subject: "ANY2CNT",
@@ -529,6 +529,7 @@ func testV1CDRsProcessEventThreshold(t *testing.T) {
acntAttrs := &utils.AttrGetAccount{
Tenant: "cgrates.org",
Account: "1005"}
time.Sleep(50 * time.Millisecond)
expectedVoice := 10.0
if err := pecdrsRpc.Call(utils.ApierV2GetAccount, acntAttrs, &acnt); err != nil {
t.Error(err)
@@ -560,12 +561,6 @@ func testV1CDRsProcessEventExport(t *testing.T) {
} else if reply != utils.OK {
t.Error("Unexpected reply received: ", reply)
}
// var cdrs []*engine.CDR
// if err := pecdrsRpc.Call(utils.CDRsV1GetCDRs, utils.RPCCDRsFilter{OriginHosts: []string{"OriginHost7"}}, &cdrs); err != nil {
// t.Error("Unexpected error: ", err)
// } else if len(cdrs) != 1 {
// t.Errorf("Expecting: 1, received: %+v", len(cdrs))
// }
}
func testV1CDRsProcessEventExportCheck(t *testing.T) {
failoverContent := []byte(fmt.Sprintf(`{"CGRID":"%s"}`, utils.Sha1("test7_processEvent", "OriginHost7")))
@@ -578,7 +573,7 @@ func testV1CDRsProcessEventExportCheck(t *testing.T) {
for _, file := range filesInDir { // First file in directory is the one we need, harder to find it's name out of config
fileName = file.Name()
filePath := path.Join(pecdrsCfg.GeneralCfg().FailedPostsDir, fileName)
if strings.HasPrefix(fileName, "cdr|*amqpv1_json_map") {
if strings.HasPrefix(fileName, "cdr|*amqp_json_map") {
foundFile = true
if readBytes, err := ioutil.ReadFile(filePath); err != nil {
t.Error(err)