From 605fde865a92091a9f9db0fc30d41728d43e7033 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Fri, 1 Aug 2014 18:57:04 +0300 Subject: [PATCH] moved stats from accounting to rating db --- cmd/cgr-engine/cgr-engine.go | 2 +- engine/loader_csv.go | 2 +- engine/loader_db.go | 2 +- engine/stats.go | 4 ++-- engine/storage_interface.go | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index b4b48ed4d..64bb155dd 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -463,7 +463,7 @@ func main() { } if cfg.CDRStatsEnabled { - cdrStats = engine.NewStats(accountDb) + cdrStats = engine.NewStats(ratingDb) if cfg.CDRStatConfig != nil && len(cfg.CDRStatConfig.Metrics) != 0 { var out int cdrStats.AddQueue(engine.NewCdrStatsFromCdrStatsCfg(cfg.CDRStatConfig), &out) diff --git a/engine/loader_csv.go b/engine/loader_csv.go index 4b8c45dfc..5913c85ab 100644 --- a/engine/loader_csv.go +++ b/engine/loader_csv.go @@ -330,7 +330,7 @@ func (csvr *CSVReader) WriteToDatabase(flush, verbose bool) (err error) { log.Print("CDR Stats Queues") } for _, sq := range csvr.cdrStats { - err = accountingStorage.SetCdrStats(sq) + err = dataStorage.SetCdrStats(sq) if err != nil { return err } diff --git a/engine/loader_db.go b/engine/loader_db.go index 5a4cd73e1..5786d1736 100644 --- a/engine/loader_db.go +++ b/engine/loader_db.go @@ -277,7 +277,7 @@ func (dbr *DbReader) WriteToDatabase(flush, verbose bool) (err error) { log.Print("CDR Stats Queues") } for _, sq := range dbr.cdrStats { - err = accountingStorage.SetCdrStats(sq) + err = dataStorage.SetCdrStats(sq) if err != nil { return err } diff --git a/engine/stats.go b/engine/stats.go index d7e72cc59..5f2133498 100644 --- a/engine/stats.go +++ b/engine/stats.go @@ -39,9 +39,9 @@ type Stats struct { mux sync.RWMutex } -func NewStats(accountDb AccountingStorage) *Stats { +func NewStats(ratingDb RatingStorage) *Stats { cdrStats := &Stats{} - if css, err := accountDb.GetAllCdrStats(); err == nil { + if css, err := ratingDb.GetAllCdrStats(); err == nil { cdrStats.UpdateQueues(css, nil) } else { Logger.Err(fmt.Sprintf("Cannot load cdr stats: %v", err)) diff --git a/engine/storage_interface.go b/engine/storage_interface.go index b0f3929e7..ecb233767 100644 --- a/engine/storage_interface.go +++ b/engine/storage_interface.go @@ -86,6 +86,9 @@ type RatingStorage interface { SetDestination(*Destination) error GetLCR(string, bool) (*LCR, error) SetLCR(*LCR) error + SetCdrStats(*CdrStats) error + GetCdrStats(string) (*CdrStats, error) + GetAllCdrStats() ([]*CdrStats, error) } type AccountingStorage interface { @@ -107,9 +110,6 @@ type AccountingStorage interface { GetAllActionTimings() (map[string]ActionPlan, error) GetDerivedChargers(string, bool) (utils.DerivedChargers, error) SetDerivedChargers(string, utils.DerivedChargers) error - SetCdrStats(*CdrStats) error - GetCdrStats(string) (*CdrStats, error) - GetAllCdrStats() ([]*CdrStats, error) } type CdrStorage interface {