From 37454f8736886fc39259c0103478e75bfe4de317 Mon Sep 17 00:00:00 2001 From: Eloy Coto Date: Wed, 5 Aug 2015 10:17:52 +0100 Subject: [PATCH] ActionsTriggers: StatsQueueTriggered with public Metrics to get the info in call_url and call_url_async --- engine/action.go | 2 +- engine/stats_queue.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/action.go b/engine/action.go index 8a6355728..0f44c9404 100644 --- a/engine/action.go +++ b/engine/action.go @@ -486,7 +486,7 @@ func mailAsync(ub *Account, sq *StatsQueueTriggered, a *Action, acs Actions) err message = []byte(fmt.Sprintf("To: %s\r\nSubject: [CGR Notification] Threshold hit on Balance: %s\r\n\r\nTime: \r\n\t%s\r\n\r\nBalance:\r\n\t%s\r\n\r\nYours faithfully,\r\nCGR Balance Monitor\r\n", toAddrStr, ub.Id, time.Now(), balJsn)) } else if sq != nil { message = []byte(fmt.Sprintf("To: %s\r\nSubject: [CGR Notification] Threshold hit on StatsQueueId: %s\r\n\r\nTime: \r\n\t%s\r\n\r\nStatsQueueId:\r\n\t%s\r\n\r\nMetrics:\r\n\t%+v\r\n\r\nTrigger:\r\n\t%+v\r\n\r\nYours faithfully,\r\nCGR CDR Stats Monitor\r\n", - toAddrStr, sq.Id, time.Now(), sq.Id, sq.metrics, sq.Trigger)) + toAddrStr, sq.Id, time.Now(), sq.Id, sq.Metrics, sq.Trigger)) } auth := smtp.PlainAuth("", cgrCfg.MailerAuthUser, cgrCfg.MailerAuthPass, strings.Split(cgrCfg.MailerServer, ":")[0]) // We only need host part, so ignore port go func() { diff --git a/engine/stats_queue.go b/engine/stats_queue.go index f7c189f6b..1f328da2e 100644 --- a/engine/stats_queue.go +++ b/engine/stats_queue.go @@ -215,12 +215,12 @@ func (sq *StatsQueue) GetId() string { // Convert data into a struct which can be used in actions based on triggers hit func (sq *StatsQueue) Triggered(at *ActionTrigger) *StatsQueueTriggered { - return &StatsQueueTriggered{Id: sq.conf.Id, metrics: sq.getStats(), Trigger: at} + return &StatsQueueTriggered{Id: sq.conf.Id, Metrics: sq.getStats(), Trigger: at} } // Struct to be passed to triggered actions type StatsQueueTriggered struct { Id string // StatsQueueId - metrics map[string]float64 + Metrics map[string]float64 Trigger *ActionTrigger }