uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-13 11:06:25 +05:00
Code Issues Packages Projects Releases Wiki Activity

Updated debitLoopSession

Browse Source
This commit is contained in:
Trial97
2019-07-17 15:50:22 +03:00
committed by Dan Christian Bogos
parent dfd034433d
commit de41b7a093
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sessions/sessions.go
View File

@@ -528,7 +528,7 @@ func (sS *SessionS) debitLoopSession(s *Session, sRunIdx int,
return
}
for i := 0; i < sS.cgrCfg.SessionSCfg().TerminateAttempts; {
for {
var maxDebit time.Duration
if maxDebit, err = sS.debitSession(s, sRunIdx, dbtIvl, nil); err != nil {
utils.Logger.Warning(
@@ -538,24 +538,37 @@ func (sS *SessionS) debitLoopSession(s *Session, sRunIdx int,
if err.Error() == utils.ErrUnauthorizedDestination.Error() {
dscReason = err.Error()
}
if err = sS.disconnectSession(s, dscReason); err != nil {
// try to disconect the session n times before we force terminate it on our side
for i := 0; i < sS.cgrCfg.SessionSCfg().TerminateAttempts; i++ {
if err = sS.disconnectSession(s, dscReason); err == nil {
return
}
utils.Logger.Warning(
fmt.Sprintf("<%s> could not disconnect session: %s, error: %s",
utils.SessionS, s.CGRid(), err.Error()))
}
if err = sS.forceSTerminate(s, 0, nil); err != nil {
utils.Logger.Warning(fmt.Sprintf("<%s> failed force-terminating session: <%s>, err: <%s>", utils.SessionS, s.CGRid(), err))
}
return
} else if maxDebit < dbtIvl {
i++
go func() { // schedule sending disconnect command
select {
case <-s.debitStop: // call was disconnected already
return
case <-time.After(maxDebit):
if err := sS.disconnectSession(s, utils.ErrInsufficientCredit.Error()); err != nil {
// try to disconect the session n times before we force terminate it on our side
for i := 0; i < sS.cgrCfg.SessionSCfg().TerminateAttempts; i++ {
if err := sS.disconnectSession(s, utils.ErrInsufficientCredit.Error()); err == nil {
return
}
utils.Logger.Warning(
fmt.Sprintf("<%s> could not command disconnect session: %s, error: %s",
utils.SessionS, s.CGRid(), err.Error()))
}
if err = sS.forceSTerminate(s, 0, nil); err != nil {
utils.Logger.Warning(fmt.Sprintf("<%s> failed force-terminating session: <%s>, err: <%s>", utils.SessionS, s.CGRid(), err))
}
}
}()
}
@@ -566,7 +579,6 @@ func (sS *SessionS) debitLoopSession(s *Session, sRunIdx int,
continue
}
}
return
}