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

Added explicit error for unknown filter type

Browse Source
This commit is contained in:
Trial97
2018-12-14 14:04:29 +02:00
committed by Dan Christian Bogos
parent 696ca08644
commit 50552de7fb
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
engine/filters.go
View File

@@ -49,7 +49,11 @@ const (
func NewFilterS(cfg *config.CGRConfig,
statSChan chan rpcclient.RpcClientConnection, dm *DataManager) *FilterS {
return &FilterS{statSChan: statSChan, dm: dm, cfg: cfg}
return &FilterS{
statSChan: statSChan,
dm: dm,
cfg: cfg,
}
}
// FilterS is a service used to take decisions in case of filters
@@ -90,6 +94,9 @@ func (fS *FilterS) Pass(tenant string, filterIDs []string,
f, err := fS.dm.GetFilter(tenant, fltrID,
true, true, utils.NonTransactional)
if err != nil {
if err == utils.ErrNotFound {
err = utils.ErrPrefixNotFound(fltrID)
}
return false, err
}
if f.ActivationInterval != nil &&
@@ -115,11 +122,11 @@ func NewFilterFromInline(tenant, inlnRule string) (f *Filter, err error) {
f = &Filter{
Tenant: tenant,
ID: inlnRule,
Rules: []*FilterRule{
{
Type: ruleSplt[0],
FieldName: ruleSplt[1],
Values: strings.Split(ruleSplt[2], utils.INFIELD_SEP)}},
Rules: []*FilterRule{{
Type: ruleSplt[0],
FieldName: ruleSplt[1],
Values: strings.Split(ruleSplt[2], utils.INFIELD_SEP),
}},
}
if err = f.Compile(); err != nil {
return nil, err
@@ -259,7 +266,7 @@ func (fltr *FilterRule) Pass(dP config.DataProvider, rpcClnt rpcclient.RpcClient
case MetaLessThan, MetaLessOrEqual, MetaGreaterThan, MetaGreaterOrEqual:
result, err = fltr.passGreaterThan(dP)
default:
err = utils.ErrNotImplemented
err = utils.ErrPrefixNotErrNotImplemented(fltr.Type)
}
if err != nil {
return false, err

14
utils/errors.go
View File

@@ -162,10 +162,18 @@ func ErrHasPrefix(err error, prfx string) (has bool) {
return strings.HasPrefix(err.Error(), prfx)
}
func ErrEnvNotFound(key string) error {
return errors.New("ENV_VAR_NOT_FOUND:" + key)
func ErrPrefix(err error, reason string) error {
return fmt.Errorf("%s:%s", err.Error(), reason)
}
func ErrPrefixNotFound(reason string) error {
return fmt.Errorf("%s:%s", ErrNotFound.Error(), reason)
return ErrPrefix(ErrNotFound, reason)
}
func ErrPrefixNotErrNotImplemented(reason string) error {
return ErrPrefix(ErrNotImplemented, reason)
}
func ErrEnvNotFound(key string) error {
return ErrPrefix(ErrNotFound, "ENV_VAR:"+key)
}