From e0de907f8801f45b7923a426d6f8d0b16eb65d0e Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Thu, 26 Nov 2015 17:34:00 +0200 Subject: [PATCH 1/2] fix error propagation --- engine/calldesc.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/calldesc.go b/engine/calldesc.go index 399e96442..b98e3def8 100644 --- a/engine/calldesc.go +++ b/engine/calldesc.go @@ -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 } From 88c5364f60481e04e1ef386576c96d5d182cdf84 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Thu, 26 Nov 2015 17:35:22 +0200 Subject: [PATCH 2/2] removed log --- engine/cdrs.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/engine/cdrs.go b/engine/cdrs.go index c1f220e9a..bb91737d9 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -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) }