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

Improve *dynaperpaid events for sessions

Browse Source
This commit is contained in:
arberkatellari
2025-02-14 17:44:30 +02:00
committed by Dan Christian Bogos
parent e2c71e355b
commit 39bca3495a
3 changed files with 351 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sessions/sessions.go
View File

@@ -1542,9 +1542,11 @@ func (sS *SessionS) initSessionDebitLoops(s *Session) {
return
}
for i, sr := range s.SRuns {
if s.DebitInterval > 0 &&
sr.Event.GetStringIgnoreErrors(utils.RequestType) == utils.MetaPrepaid {
if s.debitStop == nil { // init the debitStop only for the first sRun with DebitInterval and RequestType MetaPrepaid
if (s.DebitInterval > 0 &&
sr.Event.GetStringIgnoreErrors(utils.RequestType) == utils.MetaPrepaid) ||
(s.DebitInterval > 0 && sr.Event.GetStringIgnoreErrors(utils.RequestType) ==
utils.MetaDynaprepaid) {
if s.debitStop == nil { // init the debitStop only for the first sRun with DebitInterval and RequestType MetaPrepaids.DebitInterval > 0 &&
s.debitStop = make(chan struct{})
}
go sS.debitLoopSession(s, i, s.DebitInterval)
@@ -1666,7 +1668,7 @@ func (sS *SessionS) updateSession(s *Session, updtEv, opts engine.MapEvent, isMs
reqType := sr.Event.GetStringIgnoreErrors(utils.RequestType)
var rplyMaxUsage time.Duration
switch reqType {
case utils.MetaPrepaid:
case utils.MetaPrepaid, utils.MetaDynaprepaid:
if s.debitStop == nil {
if rplyMaxUsage, err = sS.debitSession(s, i, reqMaxUsage,
updtEv.GetDurationPtrIgnoreErrors(utils.LastUsed)); err != nil {
@@ -2455,9 +2457,9 @@ func (sS *SessionS) BiRPCv1InitiateSession(ctx *context.Context,
return err
}
s.RLock() // avoid concurrency with activeDebit
isPrepaid := s.debitStop != nil
hasDebitLoops := s.debitStop != nil
s.RUnlock()
if isPrepaid { //active debit
if hasDebitLoops { //active debit
rply.MaxUsage = utils.DurationPointer(sS.cgrCfg.SessionSCfg().GetDefaultUsage(utils.IfaceAsString(args.CGREvent.Event[utils.ToR])))
} else {
var sRunsUsage map[string]time.Duration