uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 10:06:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Add ReplyState field to track successful/failed requests

Browse Source
This commit is contained in:
ionutboangiu
2025-07-30 22:56:15 +03:00
committed by Ionut Boangiu
parent 2e0de027db
commit 3077544d62
5 changed files with 189 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
agents/libagents.go
View File

@@ -68,6 +68,8 @@ func processRequest(ctx *context.Context, reqProcessor *config.RequestProcessor,
fmt.Sprintf("<%s> LOG, processorID: %s, %s message: %s",
agentName, reqProcessor.ID, strings.ToLower(agentName[:len(agentName)-5]), agReq.Request.String()))
}
replyState := utils.OK
switch reqType {
default:
return false, fmt.Errorf("unknown request type: <%s>", reqType)
@@ -96,6 +98,9 @@ func processRequest(ctx *context.Context, reqProcessor *config.RequestProcessor,
rply := new(sessions.V1AuthorizeReply)
err = connMgr.Call(ctx, sessionsConns, utils.SessionSv1AuthorizeEvent,
authArgs, rply)
if err != nil {
replyState = utils.ErrReplyStateAuthorize
}
rply.SetMaxUsageNeeded(authArgs.GetMaxUsage)
agReq.setCGRReply(rply, err)
case utils.MetaInitiate:
@@ -112,6 +117,9 @@ func processRequest(ctx *context.Context, reqProcessor *config.RequestProcessor,
rply := new(sessions.V1InitSessionReply)
err = connMgr.Call(ctx, sessionsConns, utils.SessionSv1InitiateSession,
initArgs, rply)
if err != nil {
replyState = utils.ErrReplyStateInitiate
}
rply.SetMaxUsageNeeded(initArgs.InitSession)
agReq.setCGRReply(rply, err)
case utils.MetaUpdate:
@@ -128,6 +136,9 @@ func processRequest(ctx *context.Context, reqProcessor *config.RequestProcessor,
rply.SetMaxUsageNeeded(updateArgs.UpdateSession)
err = connMgr.Call(ctx, sessionsConns, utils.SessionSv1UpdateSession,
updateArgs, rply)
if err != nil {
replyState = utils.ErrReplyStateUpdate
}
agReq.setCGRReply(rply, err)
case utils.MetaTerminate:
terminateArgs := sessions.NewV1TerminateSessionArgs(
@@ -141,6 +152,9 @@ func processRequest(ctx *context.Context, reqProcessor *config.RequestProcessor,
var rply string
err = connMgr.Call(ctx, sessionsConns, utils.SessionSv1TerminateSession,
terminateArgs, &rply)
if err != nil {
replyState = utils.ErrReplyStateTerminate
}
agReq.setCGRReply(nil, err)
case utils.MetaMessage:
msgArgs := sessions.NewV1ProcessMessageArgs(
@@ -162,6 +176,9 @@ func processRequest(ctx *context.Context, reqProcessor *config.RequestProcessor,
rply := new(sessions.V1ProcessMessageReply)
err = connMgr.Call(ctx, sessionsConns, utils.SessionSv1ProcessMessage,
msgArgs, rply)
if err != nil {
replyState = utils.ErrReplyStateMessage
}
if utils.ErrHasPrefix(err, utils.RalsErrorPrfx) {
cgrEv.Event[utils.Usage] = 0 // avoid further debits
} else if msgArgs.Debit {
@@ -178,6 +195,9 @@ func processRequest(ctx *context.Context, reqProcessor *config.RequestProcessor,
rply := new(sessions.V1ProcessEventReply)
err = connMgr.Call(ctx, sessionsConns, utils.SessionSv1ProcessEvent,
evArgs, rply)
if err != nil {
replyState = utils.ErrReplyStateEvent
}
if utils.ErrHasPrefix(err, utils.RalsErrorPrfx) {
cgrEv.Event[utils.Usage] = 0 // avoid further debits
} else if needsMaxUsage(reqProcessor.Flags[utils.MetaRALs]) {
@@ -186,6 +206,7 @@ func processRequest(ctx *context.Context, reqProcessor *config.RequestProcessor,
agReq.setCGRReply(rply, err)
case utils.MetaCDRs: // allow CDR processing
}
// separate request so we can capture the Terminate/Event also here
if reqProcessor.Flags.GetBool(utils.MetaCDRs) &&
!reqProcessor.Flags.Has(utils.MetaDryRun) {
@@ -193,6 +214,11 @@ func processRequest(ctx *context.Context, reqProcessor *config.RequestProcessor,
if err = connMgr.Call(ctx, sessionsConns, utils.SessionSv1ProcessCDR,
cgrEv, &rplyCDRs); err != nil {
agReq.CGRReply.Map[utils.Error] = utils.NewLeafNode(err.Error())
if replyState == utils.OK {
replyState = utils.ErrReplyStateCDRs
} else {
replyState += ";" + utils.ErrReplyStateCDRs
}
}
}
if err = agReq.SetFields(reqProcessor.ReplyFields); err != nil {
@@ -235,6 +261,7 @@ func processRequest(ctx *context.Context, reqProcessor *config.RequestProcessor,
// asynchronously.
ev := cgrEv.Clone()
ev.Event[utils.ReplyState] = replyState
ev.Event[utils.StartTime] = startTime
ev.Event[utils.EndTime] = endTime
ev.Event[utils.ProcessingTime] = endTime.Sub(startTime)

32
agents/radagent.go
View File

@@ -339,6 +339,8 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
fmt.Sprintf("<%s> LOG, processorID: %s, radius message: %s",
utils.RadiusAgent, reqProcessor.ID, agReq.Request.String()))
}
replyState := utils.OK
switch reqType {
default:
return false, fmt.Errorf("unknown request type: <%s>", reqType)
@@ -366,6 +368,9 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
rply := new(sessions.V1AuthorizeReply)
err = ra.connMgr.Call(ra.ctx, ra.cgrCfg.RadiusAgentCfg().SessionSConns, utils.SessionSv1AuthorizeEvent,
authArgs, rply)
if err != nil {
replyState = utils.ErrReplyStateAuthorize
}
rply.SetMaxUsageNeeded(authArgs.GetMaxUsage)
agReq.setCGRReply(rply, err)
case utils.MetaInitiate:
@@ -382,6 +387,9 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
rply := new(sessions.V1InitSessionReply)
err = ra.connMgr.Call(ra.ctx, ra.cgrCfg.RadiusAgentCfg().SessionSConns, utils.SessionSv1InitiateSession,
initArgs, rply)
if err != nil {
replyState = utils.ErrReplyStateInitiate
}
rply.SetMaxUsageNeeded(initArgs.InitSession)
agReq.setCGRReply(rply, err)
case utils.MetaUpdate:
@@ -397,6 +405,9 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
rply := new(sessions.V1UpdateSessionReply)
err = ra.connMgr.Call(ra.ctx, ra.cgrCfg.RadiusAgentCfg().SessionSConns, utils.SessionSv1UpdateSession,
updateArgs, rply)
if err != nil {
replyState = utils.ErrReplyStateUpdate
}
rply.SetMaxUsageNeeded(updateArgs.UpdateSession)
agReq.setCGRReply(rply, err)
case utils.MetaTerminate:
@@ -411,6 +422,9 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
var rply string
err = ra.connMgr.Call(ra.ctx, ra.cgrCfg.RadiusAgentCfg().SessionSConns, utils.SessionSv1TerminateSession,
terminateArgs, &rply)
if err != nil {
replyState = utils.ErrReplyStateTerminate
}
agReq.setCGRReply(nil, err)
case utils.MetaMessage:
evArgs := sessions.NewV1ProcessMessageArgs(
@@ -431,6 +445,9 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
rply := new(sessions.V1ProcessMessageReply)
err = ra.connMgr.Call(ra.ctx, ra.cgrCfg.RadiusAgentCfg().SessionSConns,
utils.SessionSv1ProcessMessage, evArgs, rply)
if err != nil {
replyState = utils.ErrReplyStateMessage
}
if utils.ErrHasPrefix(err, utils.RalsErrorPrfx) {
cgrEv.Event[utils.Usage] = 0 // avoid further debits
} else if evArgs.Debit {
@@ -447,6 +464,9 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
rply := new(sessions.V1ProcessEventReply)
err = ra.connMgr.Call(ra.ctx, ra.cgrCfg.RadiusAgentCfg().SessionSConns,
utils.SessionSv1ProcessEvent, evArgs, rply)
if err != nil {
replyState = utils.ErrReplyStateEvent
}
if utils.ErrHasPrefix(err, utils.RalsErrorPrfx) {
cgrEv.Event[utils.Usage] = 0 // avoid further debits
} else if needsMaxUsage(reqProcessor.Flags[utils.MetaRALs]) {
@@ -455,9 +475,13 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
agReq.setCGRReply(rply, err)
case utils.MetaCDRs: // allow this method
case utils.MetaRadauth:
if pass, err := radauthReq(reqProcessor.Flags, req, agReq, rpl); err != nil {
var pass bool
if pass, err = radauthReq(reqProcessor.Flags, req, agReq, rpl); err != nil {
replyState = utils.ErrReplyStateRadauth
agReq.CGRReply.Map[utils.Error] = utils.NewLeafNode(err.Error())
} else if !pass {
// Assume failed auth counts as a failed request.
replyState = utils.ErrReplyStateRadauth
agReq.CGRReply.Map[utils.Error] = utils.NewLeafNode(utils.RadauthFailed)
}
}
@@ -468,6 +492,11 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
if err = ra.connMgr.Call(ra.ctx, ra.cgrCfg.RadiusAgentCfg().SessionSConns,
utils.SessionSv1ProcessCDR, cgrEv, &rplyCDRs); err != nil {
agReq.CGRReply.Map[utils.Error] = utils.NewLeafNode(err.Error())
if replyState == utils.OK {
replyState = utils.ErrReplyStateCDRs
} else {
replyState += ";" + utils.ErrReplyStateCDRs
}
}
}
@@ -501,6 +530,7 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
// asynchronously.
ev := cgrEv.Clone()
ev.Event[utils.ReplyState] = replyState
ev.Event[utils.StartTime] = startTime
ev.Event[utils.EndTime] = endTime
ev.Event[utils.ProcessingTime] = endTime.Sub(startTime)

9
agents/sipagent.go
View File

@@ -379,6 +379,7 @@ func (sa *SIPAgent) handleMessage(sipMessage sipingo.Message, remoteHost string)
func (sa *SIPAgent) processRequest(reqProcessor *config.RequestProcessor,
agReq *AgentRequest) (processed bool, err error) {
startTime := time.Now()
replyState := utils.OK
if pass, err := sa.filterS.Pass(agReq.Tenant,
reqProcessor.Filters, agReq); err != nil || !pass {
return pass, err
@@ -440,6 +441,9 @@ func (sa *SIPAgent) processRequest(reqProcessor *config.RequestProcessor,
rply := new(sessions.V1AuthorizeReply)
err = sa.connMgr.Call(context.TODO(), sa.cfg.SIPAgentCfg().SessionSConns, utils.SessionSv1AuthorizeEvent,
authArgs, rply)
if err != nil {
replyState = utils.ErrReplyStateAuthorize
}
rply.SetMaxUsageNeeded(authArgs.GetMaxUsage)
agReq.setCGRReply(rply, err)
case utils.MetaEvent:
@@ -452,6 +456,9 @@ func (sa *SIPAgent) processRequest(reqProcessor *config.RequestProcessor,
rply := new(sessions.V1ProcessEventReply)
err = sa.connMgr.Call(context.TODO(), sa.cfg.SIPAgentCfg().SessionSConns, utils.SessionSv1ProcessEvent,
evArgs, rply)
if err != nil {
replyState = utils.ErrReplyStateEvent
}
if utils.ErrHasPrefix(err, utils.RalsErrorPrfx) {
cgrEv.Event[utils.Usage] = 0 // avoid further debits
} else if needsMaxUsage(reqProcessor.Flags[utils.MetaRALs]) {
@@ -459,6 +466,7 @@ func (sa *SIPAgent) processRequest(reqProcessor *config.RequestProcessor,
}
agReq.setCGRReply(rply, err)
}
if err := agReq.SetFields(reqProcessor.ReplyFields); err != nil {
return false, err
}
@@ -489,6 +497,7 @@ func (sa *SIPAgent) processRequest(reqProcessor *config.RequestProcessor,
// asynchronously.
ev := cgrEv.Clone()
ev.Event[utils.ReplyState] = replyState
ev.Event[utils.StartTime] = startTime
ev.Event[utils.EndTime] = endTime
ev.Event[utils.ProcessingTime] = endTime.Sub(startTime)