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

Updated EventType and renamed EqualThan to EqualTo

Browse Source
This commit is contained in:
Tripon Alexandru-Ionut
2019-07-05 09:35:16 +03:00
committed by Dan Christian Bogos
parent 3e6d01a638
commit ff9e44b639
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
engine/cdrs.go
View File

@@ -239,14 +239,14 @@ func (cdrS *CDRServer) getCostFromRater(cdr *CDRWithArgDispatcher) (*CallCost, e
// attrStoExpThdStat will process a CGREvent with the configured subsystems
func (cdrS *CDRServer) attrStoExpThdStat(cgrEv *utils.CGREventWithArgDispatcher,
attrS, store, allowUpdate, export, thdS, statS bool, eventType string) (err error) {
attrS, store, allowUpdate, export, thdS, statS bool) (err error) {
if attrS {
if err = cdrS.attrSProcessEvent(cgrEv); err != nil {
return
}
}
if thdS {
go cdrS.thdSProcessEvent(cgrEv, eventType)
go cdrS.thdSProcessEvent(cgrEv)
}
if statS {
go cdrS.statSProcessEvent(cgrEv)
@@ -281,7 +281,7 @@ func (cdrS *CDRServer) rateCDRWithErr(cdr *CDRWithArgDispatcher) (ratedCDRs []*C
// chrgProcessEvent will process the CGREvent with ChargerS subsystem
// it is designed to run in it's own goroutine
func (cdrS *CDRServer) chrgProcessEvent(cgrEv *utils.CGREventWithArgDispatcher,
attrS, store, allowUpdate, export, thdS, statS bool, eventType string) (err error) {
attrS, store, allowUpdate, export, thdS, statS bool) (err error) {
var chrgrs []*ChrgSProcessEventReply
if err = cdrS.chargerS.Call(utils.ChargerSv1ProcessEvent,
cgrEv, &chrgrs); err != nil {
@@ -307,7 +307,7 @@ func (cdrS *CDRServer) chrgProcessEvent(cgrEv *utils.CGREventWithArgDispatcher,
ArgDispatcher: cgrEv.ArgDispatcher,
}
if errProc := cdrS.attrStoExpThdStat(arg,
attrS, store, allowUpdate, export, thdS, statS, eventType); errProc != nil {
attrS, store, allowUpdate, export, thdS, statS); errProc != nil {
utils.Logger.Warning(
fmt.Sprintf("<%s> error: %s processing CDR event %+v with %s",
utils.CDRs, errProc.Error(), cgrEv, utils.ChargerS))
@@ -346,11 +346,11 @@ func (cdrS *CDRServer) attrSProcessEvent(cgrEv *utils.CGREventWithArgDispatcher)
}
// thdSProcessEvent will send the event to ThresholdS if the connection is configured
func (cdrS *CDRServer) thdSProcessEvent(cgrEv *utils.CGREventWithArgDispatcher, eventType string) {
func (cdrS *CDRServer) thdSProcessEvent(cgrEv *utils.CGREventWithArgDispatcher) {
var tIDs []string
// we clone the CGREvent so we can add EventType without it to be propagated
thArgs := &ArgsProcessEvent{CGREvent: cgrEv.CGREvent.Clone()}
thArgs.CGREvent.Event[utils.EventType] = eventType
thArgs.CGREvent.Event[utils.EventType] = utils.CDR
if cgrEv.ArgDispatcher != nil {
thArgs.ArgDispatcher = cgrEv.ArgDispatcher
}
@@ -499,7 +499,7 @@ func (cdrS *CDRServer) V1ProcessCDR(cdr *CDRWithArgDispatcher, reply *string) (e
cdrS.exportCDRs([]*CDR{cdr.CDR}) // Replicate raw CDR
}
if cdrS.thdS != nil {
go cdrS.thdSProcessEvent(cgrEv, utils.CDRPoster)
go cdrS.thdSProcessEvent(cgrEv)
}
if cdrS.statS != nil {
go cdrS.statSProcessEvent(cgrEv)
@@ -507,7 +507,7 @@ func (cdrS *CDRServer) V1ProcessCDR(cdr *CDRWithArgDispatcher, reply *string) (e
if cdrS.chargerS != nil &&
utils.IsSliceMember([]string{"", utils.MetaRaw}, cdr.RunID) {
go cdrS.chrgProcessEvent(cgrEv, cdrS.attrS != nil, cdrS.cgrCfg.CdrsCfg().CDRSStoreCdrs, false,
len(cdrS.cgrCfg.CdrsCfg().CDRSOnlineCDRExports) != 0, cdrS.thdS != nil, cdrS.statS != nil, utils.CDRPoster)
len(cdrS.cgrCfg.CdrsCfg().CDRSOnlineCDRExports) != 0, cdrS.thdS != nil, cdrS.statS != nil)
}
*reply = utils.OK
@@ -588,7 +588,7 @@ func (cdrS *CDRServer) V1ProcessEvent(arg *ArgV1ProcessEvent, reply *string) (er
if !ralS {
if err = cdrS.attrStoExpThdStat(cgrEv,
attrS, store, false, export, thdS, statS, utils.Event); err != nil {
attrS, store, false, export, thdS, statS); err != nil {
err = utils.NewErrServerError(err)
return
}
@@ -610,7 +610,7 @@ func (cdrS *CDRServer) V1ProcessEvent(arg *ArgV1ProcessEvent, reply *string) (er
ArgDispatcher: arg.ArgDispatcher,
}
if errProc := cdrS.attrStoExpThdStat(cgrEv,
attrS, store, false, export, thdS, statS, utils.Event); err != nil {
attrS, store, false, export, thdS, statS); err != nil {
utils.Logger.Warning(
fmt.Sprintf("<%s> error: %s processing event %+v ",
utils.CDRs, errProc.Error(), cgrEv))
@@ -625,7 +625,7 @@ func (cdrS *CDRServer) V1ProcessEvent(arg *ArgV1ProcessEvent, reply *string) (er
}
if chrgS {
go cdrS.chrgProcessEvent(cgrEv,
attrS, store, false, export, thdS, statS, utils.Event)
attrS, store, false, export, thdS, statS)
}
*reply = utils.OK
return nil
@@ -773,7 +773,7 @@ func (cdrS *CDRServer) V1RateCDRs(arg *ArgRateCDRs, reply *string) (err error) {
ArgDispatcher: arg.ArgDispatcher,
}
if err = cdrS.chrgProcessEvent(argCharger,
false, store, true, export, thdS, statS, utils.CDRPoster); err != nil {
false, store, true, export, thdS, statS); err != nil {
return utils.NewErrServerError(err)
}
}

6
engine/filters.go
View File

@@ -322,7 +322,7 @@ func (fltr *FilterRule) Pass(dP config.DataProvider,
case MetaResources, MetaNotResources:
result, err = fltr.passResourceS(dP, rpcClnt, tenant)
case MetaEqual, MetaNotEqual:
result, err = fltr.passEqualThan(dP)
result, err = fltr.passEqualTo(dP)
default:
err = utils.ErrPrefixNotErrNotImplemented(fltr.Type)
}
@@ -580,7 +580,7 @@ func (fltr *FilterRule) passResourceS(dP config.DataProvider,
return true, nil
}
func (fltr *FilterRule) passEqualThan(dP config.DataProvider) (bool, error) {
func (fltr *FilterRule) passEqualTo(dP config.DataProvider) (bool, error) {
fldIf, err := config.GetDynamicInterface(fltr.FieldName, dP)
if err != nil {
if err == utils.ErrNotFound {
@@ -596,7 +596,7 @@ func (fltr *FilterRule) passEqualThan(dP config.DataProvider) (bool, error) {
if err != nil {
continue
}
if eq, err := utils.EqualThan(fldIf, sval); err != nil {
if eq, err := utils.EqualTo(fldIf, sval); err != nil {
return false, err
} else if eq {
return true, nil

8
engine/filters_test.go
View File

@@ -471,21 +471,21 @@ func TestFilterPassGreaterThan(t *testing.T) {
}
}
func TestFilterPassEqualThan(t *testing.T) {
func TestFilterpassEqualTo(t *testing.T) {
rf, err := NewFilterRule(MetaEqual, "~ASR", []string{"40"})
if err != nil {
t.Error(err)
}
ev := config.NewNavigableMap(nil)
ev.Set([]string{"ASR"}, 40.0, false, true)
if passes, err := rf.passEqualThan(ev); err != nil {
if passes, err := rf.passEqualTo(ev); err != nil {
t.Error(err)
} else if !passes {
t.Error("not passing")
}
ev = config.NewNavigableMap(nil)
ev.Set([]string{"ASR"}, 39, false, true)
if passes, err := rf.passEqualThan(ev); err != nil {
if passes, err := rf.passEqualTo(ev); err != nil {
t.Error(err)
} else if passes {
t.Error("equal should not be passing")
@@ -505,7 +505,7 @@ func TestFilterPassEqualThan(t *testing.T) {
if err != nil {
t.Error(err)
}
if passes, err := rf.passEqualThan(ev); err != nil {
if passes, err := rf.passEqualTo(ev); err != nil {
t.Error(err)
} else if !passes {
t.Error("not passing")

2
utils/reflect.go
View File

@@ -376,7 +376,7 @@ func GreaterThan(item, oItem interface{}, orEqual bool) (gte bool, err error) {
return
}
func EqualThan(item, oItem interface{}) (eq bool, err error) {
func EqualTo(item, oItem interface{}) (eq bool, err error) {
item = GetBasicType(item)
oItem = GetBasicType(oItem)
typItem := reflect.TypeOf(item)

22
utils/reflect_test.go
View File

@@ -640,55 +640,55 @@ func TestDifference(t *testing.T) {
}
func TestEqualThan(t *testing.T) {
if gte, err := EqualThan(1, 1.2); err != nil {
func TestEqualTo(t *testing.T) {
if gte, err := EqualTo(1, 1.2); err != nil {
t.Error(err)
} else if gte {
t.Error("should be not greater than")
}
if _, err := EqualThan(struct{}{},
if _, err := EqualTo(struct{}{},
map[string]interface{}{"a": "a"}); err == nil ||
!strings.HasPrefix(err.Error(), "incomparable") {
t.Error(err)
}
if gte, err := EqualThan(1.2, 1.2); err != nil {
if gte, err := EqualTo(1.2, 1.2); err != nil {
t.Error(err)
} else if !gte {
t.Error("should be equal")
}
if gte, err := EqualThan(1.3, 1.2); err != nil {
if gte, err := EqualTo(1.3, 1.2); err != nil {
t.Error(err)
} else if gte {
t.Error("should not be equal")
}
if gte, err := EqualThan(1.3, int(1)); err != nil {
if gte, err := EqualTo(1.3, int(1)); err != nil {
t.Error(err)
} else if gte {
t.Error("should not be equal")
}
if gte, err := EqualThan(1.2, 1.3); err != nil {
if gte, err := EqualTo(1.2, 1.3); err != nil {
t.Error(err)
} else if gte {
t.Error("should be equal")
}
if gte, err := EqualThan(2.0, int64(2)); err != nil {
if gte, err := EqualTo(2.0, int64(2)); err != nil {
t.Error(err)
} else if !gte {
t.Error("should be equal")
}
if gte, err := EqualThan(time.Duration(2*time.Second),
if gte, err := EqualTo(time.Duration(2*time.Second),
time.Duration(2*time.Second)); err != nil {
t.Error(err)
} else if !gte {
t.Error("should be equal")
}
now := time.Now()
if gte, err := EqualThan(now.Add(time.Second), now); err != nil {
if gte, err := EqualTo(now.Add(time.Second), now); err != nil {
t.Error(err)
} else if gte {
t.Error("should not be equal")
}
if gte, err := EqualThan(now, now); err != nil {
if gte, err := EqualTo(now, now); err != nil {
t.Error(err)
} else if !gte {
t.Error("should be equal")