From 0e59798fb552be327bc28c1ef324a3182a1862ad Mon Sep 17 00:00:00 2001 From: DanB Date: Thu, 14 Apr 2016 20:07:22 +0200 Subject: [PATCH] SMGeneric SessionTTLUsed should be considered in Update --- sessionmanager/smgeneric.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sessionmanager/smgeneric.go b/sessionmanager/smgeneric.go index 4ca71f974..cd07feac5 100644 --- a/sessionmanager/smgeneric.go +++ b/sessionmanager/smgeneric.go @@ -78,14 +78,11 @@ func (self *SMGeneric) resetTerminatorTimer(uuid string, ttl time.Duration, ttlL // Called when a session timeouts func (self *SMGeneric) ttlTerminate(s *SMGSession, tmtr *smgSessionTerminator) { - totalSessionUsage := s.TotalUsage() + tmtr.ttl - if tmtr.ttlUsage != nil { - totalSessionUsage = *tmtr.ttlUsage - } - diffSessionUsage := totalSessionUsage - s.TotalUsage() evUpdate := s.eventStart evUpdate[utils.USAGE] = 0.0 - if diffSessionUsage > 0 { + totalSessionUsage := s.TotalUsage() + tmtr.ttl + if tmtr.ttlUsage != nil { + totalSessionUsage = s.TotalUsage() + *tmtr.ttlUsage evUpdate[utils.USAGE] = diffSessionUsage.Seconds() } if tmtr.ttlLastUsed != nil {