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

Replacing CGREvent with *CGRevent when inherited for StatService

Browse Source
This commit is contained in:
TeoV
2019-05-27 15:18:10 +03:00
committed by Dan Christian Bogos
parent 14ebcb3812
commit 0987fb79db
9 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apier/v1/stats_it_test.go
View File

@@ -171,7 +171,7 @@ func testV1STSProcessEvent(t *testing.T) {
var reply []string
expected := []string{"Stats1"}
args := engine.StatsArgsProcessEvent{
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "event1",
Event: map[string]interface{}{
@@ -224,7 +224,7 @@ func testV1STSProcessEvent(t *testing.T) {
}
args2 := engine.StatsArgsProcessEvent{
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "event2",
Event: map[string]interface{}{
@@ -238,7 +238,7 @@ func testV1STSProcessEvent(t *testing.T) {
t.Errorf("Expecting: %+v, received: %+v", expected, reply)
}
args3 := engine.StatsArgsProcessEvent{
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "event3",
Event: map[string]interface{}{
@@ -520,7 +520,7 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) {
var reply2 []string
expected := []string{"CustomStatProfile"}
args := engine.StatsArgsProcessEvent{
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "event1",
Event: map[string]interface{}{
@@ -546,7 +546,7 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) {
}
//second process
args = engine.StatsArgsProcessEvent{
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "event2",
Event: map[string]interface{}{
@@ -602,7 +602,7 @@ func BenchmarkSTSV1SetEvent(b *testing.B) {
var reply string
b.StartTimer()
for i := 0; i < b.N; i++ {
if err := stsV1Rpc.Call(utils.StatSv1ProcessEvent, evs[rand.Intn(len(evs))],
if err := stsV1Rpc.Call(utils.StatSv1ProcessEvent, &evs[rand.Intn(len(evs))],
&reply); err != nil {
b.Error(err)
} else if reply != utils.OK {

4
dispatchers/stats.go
View File

@@ -60,7 +60,7 @@ func (dS *DispatcherService) StatSv1GetStatQueuesForEvent(args *engine.StatsArgs
if args.ArgDispatcher != nil {
routeID = args.ArgDispatcher.RouteID
}
return dS.Dispatch(&args.CGREvent, utils.MetaStats, routeID,
return dS.Dispatch(args.CGREvent, utils.MetaStats, routeID,
utils.StatSv1GetStatQueuesForEvent, args, reply)
}
@@ -103,7 +103,7 @@ func (dS *DispatcherService) StatSv1ProcessEvent(args *engine.StatsArgsProcessEv
if args.ArgDispatcher != nil {
routeID = args.ArgDispatcher.RouteID
}
return dS.Dispatch(&args.CGREvent, utils.MetaStats, routeID,
return dS.Dispatch(args.CGREvent, utils.MetaStats, routeID,
utils.StatSv1ProcessEvent, args, reply)
}

10
dispatchers/stats_it_test.go
View File

@@ -88,7 +88,7 @@ func testDspStsGetStatFailover(t *testing.T) {
var metrics map[string]string
expected := []string{"Stats1"}
args := engine.StatsArgsProcessEvent{
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "event1",
Event: map[string]interface{}{
@@ -159,7 +159,7 @@ func testDspStsPing(t *testing.T) {
func testDspStsTestAuthKey(t *testing.T) {
var reply []string
args := engine.StatsArgsProcessEvent{
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "event1",
Event: map[string]interface{}{
@@ -200,7 +200,7 @@ func testDspStsTestAuthKey2(t *testing.T) {
var metrics map[string]string
expected := []string{"Stats2"}
args := engine.StatsArgsProcessEvent{
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "event1",
Event: map[string]interface{}{
@@ -243,7 +243,7 @@ func testDspStsTestAuthKey2(t *testing.T) {
}
args = engine.StatsArgsProcessEvent{
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "event1",
Event: map[string]interface{}{
@@ -323,7 +323,7 @@ func testDspStsTestAuthKey3(t *testing.T) {
estats = []string{"Stats2"}
if err := dispEngine.RCP.Call(utils.StatSv1GetStatQueuesForEvent,
&engine.StatsArgsProcessEvent{
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "GetStats",
Event: map[string]interface{}{

4
engine/account.go
View File

@@ -1083,7 +1083,7 @@ func (acc *Account) AsAccountSummary() *AccountSummary {
func (acnt *Account) Publish() {
acntTnt := utils.NewTenantID(acnt.ID)
cgrEv := utils.CGREvent{
cgrEv := &utils.CGREvent{
Tenant: acntTnt.Tenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
@@ -1106,7 +1106,7 @@ func (acnt *Account) Publish() {
if thresholdS != nil {
var tIDs []string
if err := thresholdS.Call(utils.ThresholdSv1ProcessEvent,
&ArgsProcessEvent{CGREvent: &cgrEv}, &tIDs); err != nil &&
&ArgsProcessEvent{CGREvent: cgrEv}, &tIDs); err != nil &&
err.Error() != utils.ErrNotFound.Error() {
utils.Logger.Warning(
fmt.Sprintf("<AccountS> error: %s processing account event %+v with ThresholdS.", err.Error(), cgrEv))

4
engine/balances.go
View File

@@ -690,7 +690,7 @@ func (b *Balance) Publish() {
}
accountId := b.account.ID
acntTnt := utils.NewTenantID(accountId)
cgrEv := utils.CGREvent{
cgrEv := &utils.CGREvent{
Tenant: acntTnt.Tenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
@@ -715,7 +715,7 @@ func (b *Balance) Publish() {
}
if thresholdS != nil {
var tIDs []string
if err := thresholdS.Call(utils.ThresholdSv1ProcessEvent, &ArgsProcessEvent{CGREvent: &cgrEv}, &tIDs); err != nil &&
if err := thresholdS.Call(utils.ThresholdSv1ProcessEvent, &ArgsProcessEvent{CGREvent: cgrEv}, &tIDs); err != nil &&
err.Error() != utils.ErrNotFound.Error() {
utils.Logger.Warning(
fmt.Sprintf("<AccountS> error: %s processing balance event %+v with ThresholdS.",

2
engine/cdrs.go
View File

@@ -365,7 +365,7 @@ func (cdrS *CDRServer) thdSProcessEvent(cgrEv *utils.CGREventWithArgDispatcher)
// statSProcessEvent will send the event to StatS if the connection is configured
func (cdrS *CDRServer) statSProcessEvent(cgrEv *utils.CGREventWithArgDispatcher) {
var reply []string
statArgs := &StatsArgsProcessEvent{CGREvent: *cgrEv.CGREvent}
statArgs := &StatsArgsProcessEvent{CGREvent: cgrEv.CGREvent}
if cgrEv.ArgDispatcher != nil {
statArgs.ArgDispatcher = cgrEv.ArgDispatcher
}

8
engine/stats.go
View File

@@ -227,7 +227,7 @@ func (ss *StatService) Call(serviceMethod string, args interface{}, reply interf
type StatsArgsProcessEvent struct {
StatIDs []string
utils.CGREvent
*utils.CGREvent
*utils.ArgDispatcher
}
@@ -247,7 +247,7 @@ func (sS *StatService) processEvent(args *StatsArgsProcessEvent) (statQueueIDs [
stsIDs = append(stsIDs, sq.ID)
lkID := utils.StatQueuePrefix + sq.TenantID()
guardian.Guardian.Guard(func() (gRes interface{}, gErr error) {
err = sq.ProcessEvent(&args.CGREvent, sS.filterS)
err = sq.ProcessEvent(args.CGREvent, sS.filterS)
return
}, config.CgrConfig().GeneralCfg().LockingTimeout, lkID)
if err != nil {
@@ -313,7 +313,7 @@ func (sS *StatService) processEvent(args *StatsArgsProcessEvent) (statQueueIDs [
func (sS *StatService) V1ProcessEvent(args *StatsArgsProcessEvent, reply *[]string) (err error) {
if missing := utils.MissingStructFields(args, []string{"Tenant", "ID"}); len(missing) != 0 { //Params missing
return utils.NewErrMandatoryIeMissing(missing...)
} else if args.Event == nil {
} else if args.CGREvent == nil || args.Event == nil {
return utils.NewErrMandatoryIeMissing("Event")
}
if ids, err := sS.processEvent(args); err != nil {
@@ -328,7 +328,7 @@ func (sS *StatService) V1ProcessEvent(args *StatsArgsProcessEvent, reply *[]stri
func (sS *StatService) V1GetStatQueuesForEvent(args *StatsArgsProcessEvent, reply *[]string) (err error) {
if missing := utils.MissingStructFields(args, []string{"Tenant", "ID"}); len(missing) != 0 { //Params missing
return utils.NewErrMandatoryIeMissing(missing...)
} else if args.Event == nil {
} else if args.CGREvent == nil || args.Event == nil {
return utils.NewErrMandatoryIeMissing("Event")
}
var sQs StatQueues

6
engine/stats_test.go
View File

@@ -100,7 +100,7 @@ var (
}
statsEvs = []*StatsArgsProcessEvent{
{
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "event1",
Event: map[string]interface{}{
@@ -115,7 +115,7 @@ var (
},
},
{
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "event2",
Event: map[string]interface{}{
@@ -129,7 +129,7 @@ var (
},
},
{
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "event3",
Event: map[string]interface{}{

8
sessions/sessions.go
View File

@@ -1873,7 +1873,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(clnt rpcclient.RpcClientConnection,
return utils.NewErrNotConnected(utils.StatService)
}
statArgs := &engine.StatsArgsProcessEvent{
CGREvent: args.CGREvent,
CGREvent: &args.CGREvent,
ArgDispatcher: args.ArgDispatcher,
}
var statReply []string
@@ -2123,7 +2123,7 @@ func (sS *SessionS) BiRPCv1InitiateSession(clnt rpcclient.RpcClientConnection,
}
var statReply []string
statArgs := &engine.StatsArgsProcessEvent{
CGREvent: args.CGREvent,
CGREvent: &args.CGREvent,
ArgDispatcher: args.ArgDispatcher,
}
if err := sS.statS.Call(utils.StatSv1ProcessEvent,
@@ -2447,7 +2447,7 @@ func (sS *SessionS) BiRPCv1TerminateSession(clnt rpcclient.RpcClientConnection,
}
var statReply []string
statArgs := &engine.StatsArgsProcessEvent{
CGREvent: args.CGREvent,
CGREvent: &args.CGREvent,
ArgDispatcher: args.ArgDispatcher,
}
if err := sS.statS.Call(utils.StatSv1ProcessEvent,
@@ -2758,7 +2758,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.RpcClientConnection,
}
var statReply []string
statArgs := &engine.StatsArgsProcessEvent{
CGREvent: args.CGREvent,
CGREvent: &args.CGREvent,
ArgDispatcher: args.ArgDispatcher,
}
if err := sS.statS.Call(utils.StatSv1ProcessEvent,