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

Merge branch 'master' of https://github.com/cgrates/cgrates

Browse Source
This commit is contained in:
DanB
2015-11-26 17:50:01 +01:00
parent 0b6d78d714 88c5364f60
commit 2080c594a4
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/calldesc.go
View File

@@ -676,13 +676,13 @@ func (cd *CallDescriptor) Debit() (cc *CallCost, err error) {
utils.Logger.Err(fmt.Sprintf("Account: %s, not found", cd.GetAccountKey()))
return nil, utils.ErrAccountNotFound
} else {
if memberIds, err := account.GetUniqueSharedGroupMembers(cd); err == nil {
if memberIds, sgerr := account.GetUniqueSharedGroupMembers(cd); sgerr == nil {
_, err = Guardian.Guard(func() (interface{}, error) {
cc, err = cd.debit(account, false, true)
return 0, err
}, 0, memberIds...)
} else {
return nil, err
return nil, sgerr
}
return cc, err
}

3
engine/cdrs.go
View File

@@ -341,9 +341,6 @@ func (self *CdrServer) getCostFromRater(storedCdr *StoredCdr) (*CallCost, error)
if err = self.rater.Debit(cd, cc); err == nil { // Debit has occured, we are forced to write the log, even if CDR store is disabled
self.cdrDb.LogCallCost(storedCdr.CgrId, utils.CDRS_SOURCE, storedCdr.MediationRunId, cc)
}
if storedCdr.AccId == "testtutlocal_3" {
utils.Logger.Debug(fmt.Sprintf("### getCostFromRater, cdr %+v, cd: %+v, cc: %+v, error: %v", storedCdr, cd, cc, err))
}
} else {
err = self.rater.GetCost(cd, cc)
}