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

cgrates · Jun 28, 2023 · 8433196 · 8433196
1 parent d33fe25
commit 8433196
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/engine/cdr.go b/engine/cdr.go
@@ -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 {

diff --git a/engine/filters.go b/engine/filters.go
@@ -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 {