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

Small cleanups SMGeneric

Browse Source
This commit is contained in:
DanB
2016-11-14 21:04:26 +01:00
parent a5b7177f39
commit 37ca876db4
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/account.go
View File

@@ -189,10 +189,10 @@ func (ub *Account) debitBalanceAction(a *Action, reset bool) error {
bClone := a.Balance.CreateBalance()
//log.Print("Bclone: ", utils.ToJSON(a.Balance))
if bClone == nil {
return errors.New("nil balance")
return errors.New("nil balance in action")
}
if ub.BalanceMap == nil {
ub.BalanceMap = make(map[string]Balances, 1)
ub.BalanceMap = make(map[string]Balances)
}
found := false
balanceType := a.Balance.GetType()

19
sessionmanager/smgeneric.go
View File

@@ -205,7 +205,7 @@ func (smg *SMGeneric) unrecordASession(cgrID string) bool {
// indexSession explores settings and builds SessionsIndex
// uses different tables and mutex-es depending on active/passive session
func (smg *SMGeneric) indexSession(s *SMGSession, passiveSessions bool) bool {
func (smg *SMGeneric) indexSession(s *SMGSession, passiveSessions bool) {
idxMux := smg.aSIMux
ssIndx := smg.aSessionsIndex
ssRIdx := smg.aSessionsRIndex
@@ -244,25 +244,24 @@ func (smg *SMGeneric) indexSession(s *SMGSession, passiveSessions bool) bool {
}
ssRIdx[s.CGRID] = append(ssRIdx[s.CGRID], &riFieldNameVal{runID: s.RunID, fieldName: fieldName, fieldValue: fieldVal})
}
return true
return
}
// unindexASession removes a session from indexes
func (smg *SMGeneric) unindexSession(cgrID string, passiveSessions bool) bool {
idxMux := smg.aSIMux
ssRIdx := smg.aSessionsRIndex
ssIndx := smg.aSessionsIndex
ssRIdx := smg.aSessionsRIndex
if passiveSessions {
idxMux = smg.pSIMux
ssRIdx = smg.pSessionsRIndex
ssIndx = smg.pSessionsIndex
}
if _, hasIt := ssRIdx[cgrID]; !hasIt {
return false
ssRIdx = smg.pSessionsRIndex
}
idxMux.Lock()
defer idxMux.Unlock()
if _, hasIt := ssRIdx[cgrID]; !hasIt {
return false
}
for _, riFNV := range ssRIdx[cgrID] {
delete(ssIndx[riFNV.fieldName][riFNV.fieldValue][riFNV.runID], cgrID)
if len(ssIndx[riFNV.fieldName][riFNV.fieldValue][riFNV.runID]) == 0 {
@@ -495,9 +494,7 @@ func (smg *SMGeneric) setPassiveSessions(cgrID string, ss []*SMGSession) (err er
}
for _, cacheKey := range []string{"InitiateSession" + cgrID, "UpdateSession" + cgrID, "TerminateSession" + cgrID} {
if _, err := smg.responseCache.Get(cacheKey); err == nil { // Stop processing passive when there has been an update over active RPC
if _, hasCGRID := smg.passiveSessions[cgrID]; hasCGRID {
smg.deletePassiveSessions(cgrID)
}
smg.deletePassiveSessions(cgrID)
return ErrActiveSession
}
}