From 7c956456501eaecebbf0d31399186a13d5bd9c53 Mon Sep 17 00:00:00 2001 From: TeoV Date: Fri, 8 Nov 2019 10:07:26 +0200 Subject: [PATCH] Add prefix "*act" for scheduler filter --- data/conf/samples/filtered_scheduler/cgrates.json | 2 +- data/conf/samples/filtered_scheduler2/cgrates.json | 2 +- engine/task.go | 5 ++++- utils/consts.go | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/data/conf/samples/filtered_scheduler/cgrates.json b/data/conf/samples/filtered_scheduler/cgrates.json index 7a2b64913..be7fa1063 100644 --- a/data/conf/samples/filtered_scheduler/cgrates.json +++ b/data/conf/samples/filtered_scheduler/cgrates.json @@ -35,7 +35,7 @@ "scheduler": { "enabled": true, - "filters": ["*suffix:~AccountID:1001"], + "filters": ["*suffix:~*act.AccountID:1001"], }, diff --git a/data/conf/samples/filtered_scheduler2/cgrates.json b/data/conf/samples/filtered_scheduler2/cgrates.json index 149a55896..09a3679e0 100644 --- a/data/conf/samples/filtered_scheduler2/cgrates.json +++ b/data/conf/samples/filtered_scheduler2/cgrates.json @@ -35,7 +35,7 @@ "scheduler": { "enabled": true, - "filters": ["*suffix:~AccountID:1002;1003"], + "filters": ["*suffix:~*act.AccountID:1002;1003"], }, diff --git a/engine/task.go b/engine/task.go index 4776e92b6..1a6792747 100644 --- a/engine/task.go +++ b/engine/task.go @@ -67,7 +67,10 @@ func (t *Task) FieldAsString(fldPath []string) (s string, err error) { if len(fldPath) == 0 { return } - switch fldPath[0] { + if fldPath[0] != utils.MetaAct || len(fldPath) < 2 { + return "", utils.ErrPrefixNotFound(strings.Join(fldPath, utils.NestingSep)) + } + switch fldPath[1] { case utils.UUID: return t.Uuid, nil case utils.AccountID: diff --git a/utils/consts.go b/utils/consts.go index be41a67ab..176a0e720 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -572,6 +572,7 @@ const ( QueryLow = "query" UUID = "UUID" ActionsID = "ActionsID" + MetaAct = "*act" ) // Migrator Action