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

Removing debug logs, apply lazy filters in case of *combimed

Browse Source
This commit is contained in:
DanB
2023-06-28 15:17:20 +02:00
parent d33fe252d2
commit 84331962a8
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/cdr.go
View File

@@ -434,11 +434,13 @@ func (cdr *CDR) AsExportRecord(exportFields []*config.FCTemplate,
if !strings.HasPrefix(cfgFld.Path, utils.MetaExp+utils.NestingSep) {
continue
}
if pass, err := filterS.Pass(cdr.Tenant,
cfgFld.Filters, nM); err != nil {
return []string{}, err
} else if !pass {
continue
if cfgFld.Type != utils.META_COMBIMED { // *combimed will apply it's filters lazy
if pass, err := filterS.Pass(cdr.Tenant,
cfgFld.Filters, nM); err != nil {
return []string{}, err
} else if !pass {
continue
}
}
fmtOut, err := cdr.formatField(cfgFld, httpSkipTLSCheck, groupedCDRs, filterS)
if err != nil {

4
engine/filters.go
View File

@@ -52,9 +52,9 @@ type FilterS struct {
// receives the event as DataProvider so we can accept undecoded data (ie: HttpRequest)
func (fS *FilterS) Pass(tenant string, filterIDs []string,
ev utils.DataProvider) (pass bool, err error) {
defer func() {
/*defer func() {
fmt.Printf("Pass event: %+v with filters: %+v, pass: %+v, err: %+v", utils.ToIJSON(ev), utils.ToIJSON(filterIDs), pass, err)
}()
}() */
var fieldNameDP utils.DataProvider
var fieldValuesDP []utils.DataProvider
if len(filterIDs) == 0 {