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

Moved MaxCallDuration & MinCallDuration from sessions section to general section

Browse Source
This commit is contained in:
porosnicuadrian
2020-10-20 12:03:59 +03:00
committed by Dan Christian Bogos
parent fab41e1d5d
commit cf81fc80e0
21 changed files with 136 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sessions/sessions.go
View File

@@ -1398,7 +1398,7 @@ func (sS *SessionS) authEvent(cgrEv *utils.CGREventWithOpts, forceDuration bool)
return
}
err = nil
eventUsage = sS.cgrCfg.SessionSCfg().MaxCallDuration
eventUsage = sS.cgrCfg.GeneralCfg().MaxCallDuration
evStart[utils.Usage] = eventUsage // will be used in CD
}
var s *Session
@@ -1472,7 +1472,7 @@ func (sS *SessionS) updateSession(s *Session, updtEv, opts engine.MapEvent, isMs
return
}
err = nil
reqMaxUsage = sS.cgrCfg.SessionSCfg().MaxCallDuration
reqMaxUsage = sS.cgrCfg.GeneralCfg().MaxCallDuration
updtEv[utils.Usage] = reqMaxUsage
}
maxUsage = make(map[string]time.Duration)
@@ -2273,7 +2273,7 @@ func (sS *SessionS) BiRPCv1InitiateSession(clnt rpcclient.ClientConnector,
isPrepaid := s.debitStop != nil
s.RUnlock()
if isPrepaid { //active debit
rply.MaxUsage = &sS.cgrCfg.SessionSCfg().MaxCallDuration
rply.MaxUsage = &sS.cgrCfg.GeneralCfg().MaxCallDuration
} else {
var sRunsUsage map[string]time.Duration
if sRunsUsage, err = sS.updateSession(s, nil, args.Opts, false); err != nil {
@@ -3424,7 +3424,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector,
s.RUnlock()
if isPrepaid { //active debit
for _, sr := range s.SRuns {
sRunsMaxUsage[sr.CD.RunID] = sS.cgrCfg.SessionSCfg().MaxCallDuration
sRunsMaxUsage[sr.CD.RunID] = sS.cgrCfg.GeneralCfg().MaxCallDuration
}
} else if sRunsMaxUsage, err = sS.updateSession(s, nil, args.Opts, false); err != nil {
return utils.NewErrRALs(err)