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

Updated Agents flag handling

Browse Source
This commit is contained in:
Trial97
2020-07-21 13:26:27 +03:00
committed by Dan Christian Bogos
parent 510e9bc8ab
commit 6fe8d38764
5 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
agents/diamagent.go
View File

@@ -304,7 +304,7 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
}
}
var cgrArgs utils.ExtractedArgs
if cgrArgs, err = utils.ExtractArgsFromOpts(opts, reqProcessor.Flags.Has(utils.MetaDispatchers),
if cgrArgs, err = utils.ExtractArgsFromOpts(opts, reqProcessor.Flags.GetBool(utils.MetaDispatchers),
reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent); err != nil {
utils.Logger.Warning(fmt.Sprintf("<%s> args extraction failed because <%s>",
utils.DiameterAgent, err.Error()))
@@ -326,13 +326,13 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
utils.DiameterAgent, reqProcessor.ID, agReq.Request.String()))
case utils.MetaAuthorize:
authArgs := sessions.NewV1AuthorizeArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaAccounts),
reqProcessor.Flags.Has(utils.MetaRoutes),
reqProcessor.Flags.Has(utils.MetaRoutesIgnoreErrors),
@@ -349,13 +349,13 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
}
case utils.MetaInitiate:
initArgs := sessions.NewV1InitSessionArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaAccounts),
cgrEv, cgrArgs.ArgDispatcher,
reqProcessor.Flags.Has(utils.MetaFD),
@@ -368,7 +368,7 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
}
case utils.MetaUpdate:
updateArgs := sessions.NewV1UpdateSessionArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaAccounts),
cgrEv, cgrArgs.ArgDispatcher,
@@ -383,10 +383,10 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
case utils.MetaTerminate:
terminateArgs := sessions.NewV1TerminateSessionArgs(
reqProcessor.Flags.Has(utils.MetaAccounts),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
cgrEv, cgrArgs.ArgDispatcher,
reqProcessor.Flags.Has(utils.MetaFD),
@@ -399,15 +399,15 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
}
case utils.MetaMessage:
msgArgs := sessions.NewV1ProcessMessageArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaAccounts),
reqProcessor.Flags.Has(utils.MetaRoutes),
reqProcessor.Flags.GetBool(utils.MetaRoutes),
reqProcessor.Flags.Has(utils.MetaRoutesIgnoreErrors),
reqProcessor.Flags.Has(utils.MetaRoutesEventCost),
cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.RoutePaginator,
@@ -446,7 +446,7 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
case utils.MetaCDRs: // allow CDR processing
}
// separate request so we can capture the Terminate/Event also here
if reqProcessor.Flags.Has(utils.MetaCDRs) &&
if reqProcessor.Flags.GetBool(utils.MetaCDRs) &&
!reqProcessor.Flags.Has(utils.MetaDryRun) {
rplyCDRs := utils.StringPointer("")
if err = da.connMgr.Call(da.cgrCfg.DiameterAgentCfg().SessionSConns, da, utils.SessionSv1ProcessCDR,

40
agents/dnsagent.go
View File

@@ -191,7 +191,7 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor,
}
}
var cgrArgs utils.ExtractedArgs
if cgrArgs, err = utils.ExtractArgsFromOpts(opts, reqProcessor.Flags.Has(utils.MetaDispatchers),
if cgrArgs, err = utils.ExtractArgsFromOpts(opts, reqProcessor.Flags.GetBool(utils.MetaDispatchers),
reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent); err != nil {
utils.Logger.Warning(fmt.Sprintf("<%s> args extraction failed because <%s>",
utils.DNSAgent, err.Error()))
@@ -212,15 +212,15 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor,
utils.DNSAgent, reqProcessor.ID, utils.ToJSON(cgrEv)))
case utils.MetaAuthorize:
authArgs := sessions.NewV1AuthorizeArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaAccounts),
reqProcessor.Flags.Has(utils.MetaRoutes),
reqProcessor.Flags.GetBool(utils.MetaRoutes),
reqProcessor.Flags.Has(utils.MetaRoutesIgnoreErrors),
reqProcessor.Flags.Has(utils.MetaRoutesEventCost),
cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.RoutePaginator,
@@ -236,13 +236,13 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor,
}
case utils.MetaInitiate:
initArgs := sessions.NewV1InitSessionArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaAccounts),
cgrEv, cgrArgs.ArgDispatcher,
reqProcessor.Flags.Has(utils.MetaFD),
@@ -256,7 +256,7 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor,
}
case utils.MetaUpdate:
updateArgs := sessions.NewV1UpdateSessionArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaAccounts),
cgrEv, cgrArgs.ArgDispatcher,
@@ -272,10 +272,10 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor,
case utils.MetaTerminate:
terminateArgs := sessions.NewV1TerminateSessionArgs(
reqProcessor.Flags.Has(utils.MetaAccounts),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
cgrEv, cgrArgs.ArgDispatcher,
reqProcessor.Flags.Has(utils.MetaFD),
@@ -289,15 +289,15 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor,
}
case utils.MetaMessage:
evArgs := sessions.NewV1ProcessMessageArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaAccounts),
reqProcessor.Flags.Has(utils.MetaRoutes),
reqProcessor.Flags.GetBool(utils.MetaRoutes),
reqProcessor.Flags.Has(utils.MetaRoutesIgnoreErrors),
reqProcessor.Flags.Has(utils.MetaRoutesEventCost),
cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.RoutePaginator,
@@ -338,7 +338,7 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor,
case utils.MetaCDRs: // allow CDR processing
}
// separate request so we can capture the Terminate/Event also here
if reqProcessor.Flags.Has(utils.MetaCDRs) &&
if reqProcessor.Flags.GetBool(utils.MetaCDRs) &&
!reqProcessor.Flags.Has(utils.MetaDryRun) {
rplyCDRs := utils.StringPointer("")
if err = da.connMgr.Call(da.cgrCfg.DNSAgentCfg().SessionSConns, nil,

40
agents/httpagent.go
View File

@@ -126,7 +126,7 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor,
}
}
var cgrArgs utils.ExtractedArgs
if cgrArgs, err = utils.ExtractArgsFromOpts(opts, reqProcessor.Flags.Has(utils.MetaDispatchers),
if cgrArgs, err = utils.ExtractArgsFromOpts(opts, reqProcessor.Flags.GetBool(utils.MetaDispatchers),
reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent); err != nil {
utils.Logger.Warning(fmt.Sprintf("<%s> args extraction failed because <%s>",
utils.HTTPAgent, err.Error()))
@@ -147,15 +147,15 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor,
utils.HTTPAgent, reqProcessor.ID, utils.ToJSON(cgrEv)))
case utils.MetaAuthorize:
authArgs := sessions.NewV1AuthorizeArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaAccounts),
reqProcessor.Flags.Has(utils.MetaRoutes),
reqProcessor.Flags.GetBool(utils.MetaRoutes),
reqProcessor.Flags.Has(utils.MetaRoutesIgnoreErrors),
reqProcessor.Flags.Has(utils.MetaRoutesEventCost),
cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.RoutePaginator,
@@ -170,13 +170,13 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor,
}
case utils.MetaInitiate:
initArgs := sessions.NewV1InitSessionArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaAccounts),
cgrEv, cgrArgs.ArgDispatcher,
reqProcessor.Flags.Has(utils.MetaFD),
@@ -189,7 +189,7 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor,
}
case utils.MetaUpdate:
updateArgs := sessions.NewV1UpdateSessionArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaAccounts),
cgrEv, cgrArgs.ArgDispatcher,
@@ -204,10 +204,10 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor,
case utils.MetaTerminate:
terminateArgs := sessions.NewV1TerminateSessionArgs(
reqProcessor.Flags.Has(utils.MetaAccounts),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
cgrEv, cgrArgs.ArgDispatcher,
reqProcessor.Flags.Has(utils.MetaFD),
@@ -220,15 +220,15 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor,
}
case utils.MetaMessage:
evArgs := sessions.NewV1ProcessMessageArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaAccounts),
reqProcessor.Flags.Has(utils.MetaRoutes),
reqProcessor.Flags.GetBool(utils.MetaRoutes),
reqProcessor.Flags.Has(utils.MetaRoutesIgnoreErrors),
reqProcessor.Flags.Has(utils.MetaRoutesEventCost),
cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.RoutePaginator,
@@ -267,7 +267,7 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor,
case utils.MetaCDRs: // allow CDR processing
}
// separate request so we can capture the Terminate/Event also here
if reqProcessor.Flags.Has(utils.MetaCDRs) &&
if reqProcessor.Flags.GetBool(utils.MetaCDRs) &&
!reqProcessor.Flags.Has(utils.MetaDryRun) {
rplyCDRs := utils.StringPointer("")
if err = ha.connMgr.Call(ha.sessionConns, nil, utils.SessionSv1ProcessCDR,

40
agents/radagent.go
View File

@@ -184,7 +184,7 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
}
}
var cgrArgs utils.ExtractedArgs
if cgrArgs, err = utils.ExtractArgsFromOpts(opts, reqProcessor.Flags.Has(utils.MetaDispatchers),
if cgrArgs, err = utils.ExtractArgsFromOpts(opts, reqProcessor.Flags.GetBool(utils.MetaDispatchers),
reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent); err != nil {
utils.Logger.Warning(fmt.Sprintf("<%s> args extraction failed because <%s>",
utils.RadiusAgent, err.Error()))
@@ -205,15 +205,15 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
utils.RadiusAgent, reqProcessor.ID, utils.ToJSON(cgrEv)))
case utils.MetaAuthorize:
authArgs := sessions.NewV1AuthorizeArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaAccounts),
reqProcessor.Flags.Has(utils.MetaRoutes),
reqProcessor.Flags.GetBool(utils.MetaRoutes),
reqProcessor.Flags.Has(utils.MetaRoutesIgnoreErrors),
reqProcessor.Flags.Has(utils.MetaRoutesEventCost),
cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.RoutePaginator,
@@ -228,13 +228,13 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
}
case utils.MetaInitiate:
initArgs := sessions.NewV1InitSessionArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaAccounts),
cgrEv, cgrArgs.ArgDispatcher,
reqProcessor.Flags.Has(utils.MetaFD),
@@ -247,7 +247,7 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
}
case utils.MetaUpdate:
updateArgs := sessions.NewV1UpdateSessionArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaAccounts),
cgrEv, cgrArgs.ArgDispatcher,
@@ -262,10 +262,10 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
case utils.MetaTerminate:
terminateArgs := sessions.NewV1TerminateSessionArgs(
reqProcessor.Flags.Has(utils.MetaAccounts),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
cgrEv, cgrArgs.ArgDispatcher,
reqProcessor.Flags.Has(utils.MetaFD),
@@ -278,15 +278,15 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
}
case utils.MetaMessage:
evArgs := sessions.NewV1ProcessMessageArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaAccounts),
reqProcessor.Flags.Has(utils.MetaRoutes),
reqProcessor.Flags.GetBool(utils.MetaRoutes),
reqProcessor.Flags.Has(utils.MetaRoutesIgnoreErrors),
reqProcessor.Flags.Has(utils.MetaRoutesEventCost),
cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.RoutePaginator,
@@ -328,7 +328,7 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
}
}
// separate request so we can capture the Terminate/Event also here
if reqProcessor.Flags.Has(utils.MetaCDRs) {
if reqProcessor.Flags.GetBool(utils.MetaCDRs) {
rplyCDRs := utils.StringPointer("")
if err = ra.connMgr.Call(ra.cgrCfg.RadiusAgentCfg().SessionSConns, nil, utils.SessionSv1ProcessCDR,
&utils.CGREventWithArgDispatcher{CGREvent: cgrEv,

40
agents/sipagent.go
View File

@@ -391,7 +391,7 @@ func (sa *SIPAgent) processRequest(reqProcessor *config.RequestProcessor,
}
}
var cgrArgs utils.ExtractedArgs
if cgrArgs, err = utils.ExtractArgsFromOpts(opts, reqProcessor.Flags.Has(utils.MetaDispatchers),
if cgrArgs, err = utils.ExtractArgsFromOpts(opts, reqProcessor.Flags.GetBool(utils.MetaDispatchers),
reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent); err != nil {
utils.Logger.Warning(fmt.Sprintf("<%s> args extraction failed because <%s>",
utils.SIPAgent, err.Error()))
@@ -412,15 +412,15 @@ func (sa *SIPAgent) processRequest(reqProcessor *config.RequestProcessor,
utils.SIPAgent, reqProcessor.ID, utils.ToJSON(cgrEv)))
case utils.MetaAuthorize:
authArgs := sessions.NewV1AuthorizeArgs(
reqProcessor.Flags.Has(utils.MetaAttributes),
reqProcessor.Flags.GetBool(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaThresholds),
reqProcessor.Flags.GetBool(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaStats),
reqProcessor.Flags.GetBool(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats, utils.MetaIDs),
reqProcessor.Flags.Has(utils.MetaResources),
reqProcessor.Flags.GetBool(utils.MetaResources),
reqProcessor.Flags.Has(utils.MetaAccounts),
reqProcessor.Flags.Has(utils.MetaRoutes),
reqProcessor.Flags.GetBool(utils.MetaRoutes),
reqProcessor.Flags.Has(utils.MetaRoutesIgnoreErrors),
reqProcessor.Flags.Has(utils.MetaRoutesEventCost),
cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.RoutePaginator,
@@ -435,13 +435,13 @@ func (sa *SIPAgent) processRequest(reqProcessor *config.RequestProcessor,
}
// case utils.MetaInitiate:
// initArgs := sessions.NewV1InitSessionArgs(
// reqProcessor.Flags.Has(utils.MetaAttributes),
// reqProcessor.Flags.GetBool(utils.MetaAttributes),
// reqProcessor.Flags.ParamsSlice(utils.MetaAttributes,utils.MetaIDs),
// reqProcessor.Flags.Has(utils.MetaThresholds),
// reqProcessor.Flags.GetBool(utils.MetaThresholds),
// reqProcessor.Flags.ParamsSlice(utils.MetaThresholds,utils.MetaIDs),
// reqProcessor.Flags.Has(utils.MetaStats),
// reqProcessor.Flags.GetBool(utils.MetaStats),
// reqProcessor.Flags.ParamsSlice(utils.MetaStats,utils.MetaIDs),
// reqProcessor.Flags.Has(utils.MetaResources),
// reqProcessor.Flags.GetBool(utils.MetaResources),
// reqProcessor.Flags.Has(utils.MetaAccounts),
// cgrEv, cgrArgs.ArgDispatcher,
// reqProcessor.Flags.Has(utils.MetaFD),
@@ -454,7 +454,7 @@ func (sa *SIPAgent) processRequest(reqProcessor *config.RequestProcessor,
// }
// case utils.MetaUpdate:
// updateArgs := sessions.NewV1UpdateSessionArgs(
// reqProcessor.Flags.Has(utils.MetaAttributes),
// reqProcessor.Flags.GetBool(utils.MetaAttributes),
// reqProcessor.Flags.ParamsSlice(utils.MetaAttributes,utils.MetaIDs),
// reqProcessor.Flags.Has(utils.MetaAccounts),
// cgrEv, cgrArgs.ArgDispatcher,
@@ -469,10 +469,10 @@ func (sa *SIPAgent) processRequest(reqProcessor *config.RequestProcessor,
// case utils.MetaTerminate:
// terminateArgs := sessions.NewV1TerminateSessionArgs(
// reqProcessor.Flags.Has(utils.MetaAccounts),
// reqProcessor.Flags.Has(utils.MetaResources),
// reqProcessor.Flags.Has(utils.MetaThresholds),
// reqProcessor.Flags.GetBool(utils.MetaResources),
// reqProcessor.Flags.GetBool(utils.MetaThresholds),
// reqProcessor.Flags.ParamsSlice(utils.MetaThresholds,utils.MetaIDs),
// reqProcessor.Flags.Has(utils.MetaStats),
// reqProcessor.Flags.GetBool(utils.MetaStats),
// reqProcessor.Flags.ParamsSlice(utils.MetaStats,utils.MetaIDs),
// cgrEv, cgrArgs.ArgDispatcher,
// reqProcessor.Flags.Has(utils.MetaFD),
@@ -485,15 +485,15 @@ func (sa *SIPAgent) processRequest(reqProcessor *config.RequestProcessor,
// }
// case utils.MetaMessage:
// evArgs := sessions.NewV1ProcessMessageArgs(
// reqProcessor.Flags.Has(utils.MetaAttributes),
// reqProcessor.Flags.GetBool(utils.MetaAttributes),
// reqProcessor.Flags.ParamsSlice(utils.MetaAttributes,utils.MetaIDs),
// reqProcessor.Flags.Has(utils.MetaThresholds),
// reqProcessor.Flags.GetBool(utils.MetaThresholds),
// reqProcessor.Flags.ParamsSlice(utils.MetaThresholds,utils.MetaIDs),
// reqProcessor.Flags.Has(utils.MetaStats),
// reqProcessor.Flags.GetBool(utils.MetaStats),
// reqProcessor.Flags.ParamsSlice(utils.MetaStats,utils.MetaIDs),
// reqProcessor.Flags.Has(utils.MetaResources),
// reqProcessor.Flags.GetBool(utils.MetaResources),
// reqProcessor.Flags.Has(utils.MetaAccounts),
// reqProcessor.Flags.Has(utils.MetaRoutes),
// reqProcessor.Flags.GetBool(utils.MetaRoutes),
// reqProcessor.Flags.Has(utils.MetaRoutesIgnoreErrors),
// reqProcessor.Flags.Has(utils.MetaRoutesEventCost),
// cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.RoutePaginator,
@@ -533,7 +533,7 @@ func (sa *SIPAgent) processRequest(reqProcessor *config.RequestProcessor,
// case utils.MetaCDRs: // allow CDR processing
}
// separate request so we can capture the Terminate/Event also here
// if reqProcessor.Flags.Has(utils.MetaCDRs) &&
// if reqProcessor.Flags.GetBool(utils.MetaCDRs) &&
// !reqProcessor.Flags.Has(utils.MetaDryRun) {
// rplyCDRs := utils.StringPointer("")
// if err = sa.connMgr.Call(sa.cfg.SIPAgentCfg().SessionSConns, nil, utils.SessionSv1ProcessCDR,