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

Removing *default stats building

Browse Source
This commit is contained in:
DanB
2015-06-30 10:16:52 +02:00
parent 7055573f4c
commit 3d745e4a51
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/cgr-engine/cgr-engine.go
View File

@@ -490,12 +490,8 @@ func main() {
go stopRaterSignalHandler()
stopHandled = true
}
if cfg.CDRStatsEnabled { // Init it here so we make it availabe to the Apier
cdrStats = engine.NewStats(ratingDb, accountDb, cfg.CDRStatsSaveInterval)
if cfg.CDRStatConfig != nil && len(cfg.CDRStatConfig.Metrics) != 0 {
cdrStats.AddQueue(engine.NewCdrStatsFromCdrStatsCfg(cfg.CDRStatConfig), nil)
}
server.RpcRegister(cdrStats)
server.RpcRegister(&v1.CDRStatsV1{CdrStats: cdrStats}) // Public APIs
}

4
data/tariffplans/cdrstats/CdrStats.csv
View File

@@ -1,6 +1,6 @@
#Id[0],QueueLength[1],TimeWindow[2],SaveInerval[3],Metric[4],SetupInterval[5],TOR[6],CdrHost[7],CdrSource[8],ReqType[9],Direction[10],Tenant[11],Category[12],Account[13],Subject[14],DestinationPrefix[15],PddInterval[16],UsageInterval[17],Supplier[18],DisconnectCause[19],MediationRunIds[20],RatedAccount[21],RatedSubject[22],CostInterval[23],Triggers[24]
CDRST3,5,60m,10s,ASR,2014-07-29T15:00:00Z;2014-07-29T16:00:00Z,*voice,87.139.12.167,FS_JSON,rated,*out,cgrates.org,call,dan,dan,+49,,5m;10m,,,default,rif,rif,0;2,CDRST3_WARN_ASR
CDRST3,5,60m,,ASR,2014-07-29T15:00:00Z;2014-07-29T16:00:00Z,*voice,87.139.12.167,FS_JSON,rated,*out,cgrates.org,call,dan,dan,+49,,5m;10m,,,default,rif,rif,0;2,CDRST3_WARN_ASR
CDRST3,,,,ACD,,,,,,,,,,,,,,,,,,,,CDRST3_WARN_ACD
CDRST3,,,,ACC,,,,,,,,,,,,,,,,,,,,CDRST3_WARN_ACC
CDRST4,10,0,10s,ASR,,,,,,,cgrates.org,call,,,,,,,,,,,,CDRST4_WARN_ASR
CDRST4,10,0,,ASR,,,,,,,cgrates.org,call,,,,,,,,,,,,CDRST4_WARN_ASR
CDRST4,,,,ACD,,,,,,,,,,,,,,,,,,,,CDRST4_WARN_ACD
1 #Id[0] QueueLength[1] TimeWindow[2] SaveInerval[3] Metric[4] SetupInterval[5] TOR[6] CdrHost[7] CdrSource[8] ReqType[9] Direction[10] Tenant[11] Category[12] Account[13] Subject[14] DestinationPrefix[15] PddInterval[16] UsageInterval[17] Supplier[18] DisconnectCause[19] MediationRunIds[20] RatedAccount[21] RatedSubject[22] CostInterval[23] Triggers[24]
2 CDRST3 5 60m 10s ASR 2014-07-29T15:00:00Z;2014-07-29T16:00:00Z *voice 87.139.12.167 FS_JSON rated *out cgrates.org call dan dan +49 5m;10m default rif rif 0;2 CDRST3_WARN_ASR
3 CDRST3 ACD CDRST3_WARN_ACD
4 CDRST3 ACC CDRST3_WARN_ACC
5 CDRST4 10 0 10s ASR cgrates.org call CDRST4_WARN_ASR
6 CDRST4 ACD CDRST4_WARN_ACD

9
engine/stats.go
View File

@@ -69,10 +69,13 @@ func newQueueSaver(id string, saveInterval time.Duration, sq *StatsQueue, adb Ac
adb: adb,
}
svr.save = func(svr *queueSaver) {
//Logger.Debug(fmt.Sprintf("svr.save, statsQueue: %+v", sq))
for {
select {
case <-svr.ticker.C:
//Logger.Debug(fmt.Sprintf("svr.ticket.C, statsQueue: %+v", sq))
if svr.sq.IsDirty() {
//Logger.Debug("svr.sq.IsDirty")
svr.sq.mux.Lock()
if err := svr.adb.SetCdrStatsQueue(svr.sq); err != nil {
Logger.Err(fmt.Sprintf("Error saving cdr stats queue id %s: %v", id, err))
@@ -201,12 +204,6 @@ func (s *Stats) UpdateQueues(css []*CdrStats, out *int) error {
oldSavers := s.queueSavers
s.queues = make(map[string]*StatsQueue, len(css))
s.queueSavers = make(map[string]*queueSaver, len(css))
if def, exists := oldQueues[utils.META_DEFAULT]; exists {
def.UpdateConf(def.conf) // for reset
s.queues[utils.META_DEFAULT] = def
s.queueSavers[utils.META_DEFAULT] = oldSavers[utils.META_DEFAULT]
delete(oldSavers, utils.META_DEFAULT)
}
for _, cs := range css {
var sq *StatsQueue
var existing bool