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

Updated forceSTerminate and asActiveSessions

Browse Source
This commit is contained in:
Trial97
2019-03-11 16:22:10 +02:00
committed by Dan Christian Bogos
parent 91cf068475
commit 9cd07a0a88
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sessions/session.go
View File

@@ -202,15 +202,22 @@ type SRun struct {
}
// Clone returns the cloned version of SRun
func (sr *SRun) Clone() *SRun {
return &SRun{
Event: sr.Event.Clone(),
CD: sr.CD.Clone(),
EventCost: sr.EventCost.Clone(),
func (sr *SRun) Clone() (clsr *SRun) {
clsr = &SRun{
Event: sr.Event.Clone(),
// CD: sr.CD.Clone(),
// EventCost: sr.EventCost.Clone(),
ExtraDuration: sr.ExtraDuration,
LastUsage: sr.LastUsage,
TotalUsage: sr.TotalUsage,
}
if sr.CD != nil {
clsr.CD = sr.CD.Clone()
}
if sr.EventCost != nil {
clsr.EventCost = sr.EventCost.Clone()
}
return
}
// debitReserve attempty to debit from ExtraDuration and returns remaining duration

30
sessions/sessions.go
View File

@@ -377,19 +377,20 @@ func (sS *SessionS) forceSTerminate(s *Session, extraDebit time.Duration, lastUs
"<%s> failed force terminating session with ID <%s>, err: <%s>",
utils.SessionS, s.CGRid(), err.Error()))
}
// Generate CDRs for each session run
var cgrEvs []*utils.CGREvent
if cgrEvs, err = s.AsCGREvents(sS.cgrCfg); err != nil {
utils.Logger.Warning(
fmt.Sprintf(
"<%s> could not create CDRs for session: <%s>, err: <%s>",
utils.SessionS, s.CGRid(), err.Error()))
cgrEv := utils.CGREvent{
Tenant: s.Tenant,
Event: s.EventStart.AsMapInterface(),
}
for _, sr := range s.SRuns {
cgrEv.Event[utils.Usage] = sr.TotalUsage
break
}
// post the CDRs
for _, cgrEv := range cgrEvs {
if sS.cdrS != nil {
var reply string
if err = sS.cdrS.Call(utils.CDRsV2ProcessCDR,
&engine.ArgV2ProcessCDR{CGREvent: *cgrEv}, &reply); err != nil {
&engine.ArgV2ProcessCDR{CGREvent: cgrEv}, &reply); err != nil {
utils.Logger.Warning(
fmt.Sprintf(
"<%s> could not post CDR for event %s, err: %s",
@@ -400,12 +401,9 @@ func (sS *SessionS) forceSTerminate(s *Session, extraDebit time.Duration, lastUs
if sS.resS != nil && s.ResourceID != "" {
var reply string
argsRU := utils.ArgRSv1ResourceUsage{
CGREvent: utils.CGREvent{
Tenant: s.Tenant,
Event: s.EventStart.AsMapInterface(),
},
UsageID: s.ResourceID,
Units: 1,
CGREvent: cgrEv,
UsageID: s.ResourceID,
Units: 1,
}
if err := sS.resS.Call(utils.ResourceSv1ReleaseResources,
argsRU, &reply); err != nil {
@@ -905,7 +903,7 @@ func (sS *SessionS) asActiveSessions(fltrs map[string]string,
var remainingSessions []*Session // Survived index matching
ss := sS.getSessions(fltrs[utils.CGRID], psv)
for _, s := range ss {
remainingSessions = append(remainingSessions, s)
remainingSessions = append(remainingSessions, s.Clone())
}
if len(fltrs) != 0 { // Still have some filters to match
for i := 0; i < len(remainingSessions); {