uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-22 07:38:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

Added ResetQueue and cleaned cdrs on queue conf update

Browse Source
This commit is contained in:
Radu Ioan Fericean
2014-08-01 20:13:53 +03:00
parent 39379bf64a
commit a1e562e248
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
engine/stats.go
View File

@@ -33,6 +33,7 @@ type StatsInterface interface {
AppendCDR(*utils.StoredCdr, *int) error
AddQueue(*CdrStats, *int) error
ReloadQueues([]string, *int) error
ResetQueues([]string, *int) error
}
type Stats struct {
@@ -104,6 +105,36 @@ func (s *Stats) ReloadQueues(ids []string, out *int) error {
return nil
}
func (s *Stats) ResetQueues(ids []string, out *int) error {
if ids == nil {
for _, sq := range s.queues {
sq.cdrs = make([]*QCdr, sq.conf.QueueLength)
sq.metrics = make(map[string]Metric, len(sq.conf.Metrics))
for _, m := range sq.conf.Metrics {
if metric := CreateMetric(m); metric != nil {
sq.metrics[m] = metric
}
}
}
} else {
for _, id := range ids {
sq, exists := s.queues[id]
if !exists {
Logger.Err(fmt.Sprintf("Cannot reset queue id %v: Not Fund", id))
continue
}
sq.cdrs = make([]*QCdr, sq.conf.QueueLength)
sq.metrics = make(map[string]Metric, len(sq.conf.Metrics))
for _, m := range sq.conf.Metrics {
if metric := CreateMetric(m); metric != nil {
sq.metrics[m] = metric
}
}
}
}
return nil
}
// change the xisting ones
// add new ones
// delete the ones missing from the new list
@@ -169,3 +200,7 @@ func (ps *ProxyStats) AddQueue(cs *CdrStats, out *int) error {
func (ps *ProxyStats) ReloadQueues(ids []string, out *int) error {
return ps.Client.Call("Stats.ReloadQueues", ids, out)
}
func (ps *ProxyStats) ResetQueues(ids []string, out *int) error {
return ps.Client.Call("Stats.ReserQueues", ids, out)
}

6
engine/stats_queue.go
View File

@@ -51,11 +51,13 @@ func NewStatsQueue(conf *CdrStats) *StatsQueue {
}
func (sq *StatsQueue) UpdateConf(conf *CdrStats) {
sq.mux.Lock()
defer sq.mux.Unlock()
sq.conf = conf
sq.cdrs = make([]*QCdr, conf.QueueLength)
sq.metrics = make(map[string]Metric, len(conf.Metrics))
for _, m := range conf.Metrics {
metric := CreateMetric(m)
if metric != nil {
if metric := CreateMetric(m); metric != nil {
sq.metrics[m] = metric
}
}