Merge branch 'master' into load

This commit is contained in:
Radu Ioan Fericean
2015-06-06 09:49:57 +03:00
25 changed files with 495 additions and 166 deletions

View File

@@ -120,6 +120,7 @@ func (self *PostgresStorage) SetRatedCdr(cdr *StoredCdr) (err error) {
SetupTime: cdr.SetupTime,
AnswerTime: cdr.AnswerTime,
Usage: cdr.Usage.Seconds(),
Pdd: cdr.Pdd.Seconds(),
Supplier: cdr.Supplier,
DisconnectCause: cdr.DisconnectCause,
Cost: cdr.Cost,
@@ -131,7 +132,8 @@ func (self *PostgresStorage) SetRatedCdr(cdr *StoredCdr) (err error) {
tx = self.db.Begin()
updated := tx.Model(TblRatedCdr{}).Where(&TblRatedCdr{Cgrid: cdr.CgrId, Runid: cdr.MediationRunId}).Updates(&TblRatedCdr{Reqtype: cdr.ReqType,
Direction: cdr.Direction, Tenant: cdr.Tenant, Category: cdr.Category, Account: cdr.Account, Subject: cdr.Subject, Destination: cdr.Destination,
SetupTime: cdr.SetupTime, AnswerTime: cdr.AnswerTime, Usage: cdr.Usage.Seconds(), Supplier: cdr.Supplier, DisconnectCause: cdr.DisconnectCause, Cost: cdr.Cost, ExtraInfo: cdr.ExtraInfo,
SetupTime: cdr.SetupTime, AnswerTime: cdr.AnswerTime, Usage: cdr.Usage.Seconds(), Pdd: cdr.Pdd.Seconds(), Supplier: cdr.Supplier, DisconnectCause: cdr.DisconnectCause,
Cost: cdr.Cost, ExtraInfo: cdr.ExtraInfo,
UpdatedAt: time.Now()})
if updated.Error != nil {
tx.Rollback()