From aea3a158c30e7c2aa71bb7358f164289fd30897f Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Fri, 21 Sep 2012 15:06:18 +0300 Subject: [PATCH] logging for user balance restore --- cmd/cgr-rater/cgr-rater.go | 1 - mediator/mediator.go | 11 +++-------- timespans/storage_redis.go | 1 + timespans/userbalance.go | 2 ++ 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cmd/cgr-rater/cgr-rater.go b/cmd/cgr-rater/cgr-rater.go index bc91445ec..d424ca1e5 100644 --- a/cmd/cgr-rater/cgr-rater.go +++ b/cmd/cgr-rater/cgr-rater.go @@ -204,7 +204,6 @@ func startMediator(responder *timespans.Responder, loggerDb timespans.DataStorag timespans.Logger.Crit(fmt.Sprintf("Could not connect to rater: %v", err)) exitChan <- true } - timespans.Logger.Debug(fmt.Sprintf("Using remote connector: %s.", mediator_rater)) connector = ×pans.RPCClientConnector{client} } if _, err := os.Stat(mediator_cdr_path); err != nil { diff --git a/mediator/mediator.go b/mediator/mediator.go index 089c2a19d..47f7ec80e 100644 --- a/mediator/mediator.go +++ b/mediator/mediator.go @@ -158,17 +158,12 @@ func (m *Mediator) parseCSV(cdrfn string) (err error) { cc, err = m.GetCostsFromDB(record) } else { cc, err = m.GetCostsFromRater(record) - } if err != nil { - timespans.Logger.Err(fmt.Sprintf("Could not get the cost for mediator record (%v): %v", record, err)) + timespans.Logger.Err(fmt.Sprintf("Could not get the cost for mediator record (%s): %v", record[m.uuidIndex], err)) } else { - if cc != nil { - timespans.Logger.Debug(fmt.Sprintf("Calculated cost: %v (%v)", cc.ConnectFee+cc.Cost, strconv.FormatFloat(cc.ConnectFee+cc.Cost, 'f', -1, 64))) - record = append(record, strconv.FormatFloat(cc.ConnectFee+cc.Cost, 'f', -1, 64)) - } else { - timespans.Logger.Err(fmt.Sprintf("Got nil call cost for record (%v)", record)) - } + timespans.Logger.Debug(fmt.Sprintf("Calculated cost: %v (%v)", cc.ConnectFee+cc.Cost, strconv.FormatFloat(cc.ConnectFee+cc.Cost, 'f', -1, 64))) + record = append(record, strconv.FormatFloat(cc.ConnectFee+cc.Cost, 'f', -1, 64)) } w.WriteString(strings.Join(record, ",") + "\n") } diff --git a/timespans/storage_redis.go b/timespans/storage_redis.go index e40e53faf..63f8813b7 100644 --- a/timespans/storage_redis.go +++ b/timespans/storage_redis.go @@ -92,6 +92,7 @@ func (rs *RedisStorage) SetActions(key string, as []*Action) (err error) { } func (rs *RedisStorage) GetUserBalance(key string) (ub *UserBalance, err error) { + Logger.Debug(fmt.Sprintf("Getting ub for: %v", key)) if values, err := rs.db.Get(USER_BALANCE_PREFIX + key); err == nil { ub = &UserBalance{Id: key} err = rs.ms.Unmarshal(values, ub) diff --git a/timespans/userbalance.go b/timespans/userbalance.go index f5c9b0888..72b6b4a03 100644 --- a/timespans/userbalance.go +++ b/timespans/userbalance.go @@ -20,6 +20,7 @@ package timespans import ( "errors" + "fmt" "strconv" "strings" ) @@ -303,6 +304,7 @@ func (ub *UserBalance) store() (result string) { De-serializes the user balance for the storage. Used for key-value storages. */ func (ub *UserBalance) restore(input string) { + Logger.Debug(fmt.Sprintf("User balance string", input)) elements := strings.Split(input, "|") ub.Id = elements[0] ub.Type = elements[1]