Corrections for NewAgentRequest constructor

This commit is contained in:
DanB
2018-10-05 14:11:03 +02:00
parent 96960f28ee
commit 3fbab340de
3 changed files with 6 additions and 7 deletions

View File

@@ -124,8 +124,9 @@ func (da *DiameterAgent) handleMessage(c diam.Conn, m *diam.Message) {
lclProcessed, err = da.processRequest(reqProcessor,
newAgentRequest(
newDADataProvider(m), reqVars, rply,
reqProcessor.Tenant,
da.cgrCfg.DefaultTenant, da.filterS))
reqProcessor.Tenant, da.cgrCfg.DefaultTenant,
utils.FirstNonEmpty(reqProcessor.Timezone, config.CgrConfig().DefaultTimezone),
da.filterS))
if lclProcessed {
processed = lclProcessed
}
@@ -196,14 +197,14 @@ func (da *DiameterAgent) handleMessage(c diam.Conn, m *diam.Message) {
func (da *DiameterAgent) processRequest(reqProcessor *config.DARequestProcessor,
agReq *AgentRequest) (processed bool, err error) {
if pass, err := da.filterS.Pass(agReq.Tenant,
if pass, err := da.filterS.Pass(agReq.tenant,
reqProcessor.Filters, agReq); err != nil || !pass {
return pass, err
}
if agReq.CGRRequest, err = agReq.AsNavigableMap(reqProcessor.RequestFields); err != nil {
return
}
cgrEv := agReq.CGRRequest.AsCGREvent(agReq.Tenant, utils.NestingSep)
cgrEv := agReq.CGRRequest.AsCGREvent(agReq.tenant, utils.NestingSep)
var reqType string
for _, typ := range []string{
utils.MetaDryRun, utils.MetaAuth,

View File

@@ -58,7 +58,6 @@ func (ha *HTTPAgent) ServeHTTP(w http.ResponseWriter, req *http.Request) {
utils.HTTPAgent, err.Error()))
return
}
var processed bool
for _, reqProcessor := range ha.reqProcessors {
agReq := newAgentRequest(dcdr, nil, nil,
reqProcessor.Tenant, ha.dfltTenant,

View File

@@ -296,8 +296,7 @@ func (dP *diameterDP) FieldAsString(fldPath []string) (data string, err error) {
if err != nil {
return
}
data, _ = utils.CastFieldIfToString(valIface)
return
return utils.IfaceAsString(valIface)
}
// FieldAsInterface is part of engine.DataProvider interface