From 2bb4f07c2711fe30cebfa8270324cdb9a95e49a1 Mon Sep 17 00:00:00 2001 From: DanB Date: Mon, 21 Oct 2019 13:36:22 +0200 Subject: [PATCH] SessionS - better handling of replyMaxUsage in case of authorization --- sessions/sessions.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sessions/sessions.go b/sessions/sessions.go index dc6cef5f9..b3d8b346f 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -1353,6 +1353,7 @@ func (sS *SessionS) authEvent(tnt string, evStart engine.MapEvent) (maxUsage tim } var maxUsageSet bool // so we know if we have set the 0 on purpose for _, sr := range s.SRuns { + fmt.Printf("Checking sr: %s\n", utils.ToIJSON(sr)) var rplyMaxUsage time.Duration if !authReqs.HasField( sr.Event.GetStringIgnoreErrors(utils.RequestType)) { @@ -1362,9 +1363,13 @@ func (sS *SessionS) authEvent(tnt string, evStart engine.MapEvent) (maxUsage tim ArgDispatcher: s.ArgDispatcher}, &rplyMaxUsage); err != nil { return } + if rplyMaxUsage > eventUsage { + rplyMaxUsage = eventUsage + } if !maxUsageSet || - maxUsage == eventUsage || - (rplyMaxUsage < maxUsage && rplyMaxUsage != eventUsage) { + //maxUsage == eventUsage || + //(rplyMaxUsage < maxUsage && rplyMaxUsage != eventUsage) { + rplyMaxUsage < maxUsage { maxUsage = rplyMaxUsage maxUsageSet = true }