IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-30 04:34:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

better formating for error trace

Browse Source
This commit is contained in:
bergquist 2017-09-12 10:31:57 +02:00
parent d55b49b7b7
commit bc678899f7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/alerting/engine.go
View File

@ -117,7 +117,10 @@ func (e *Engine) processJob(grafanaCtx context.Context, job *Job) error {
if err := recover(); err != nil { if err := recover(); err != nil {
e.log.Error("Alert Panic", "error", err, "stack", log.Stack(1)) e.log.Error("Alert Panic", "error", err, "stack", log.Stack(1))
ext.Error.Set(span, true) ext.Error.Set(span, true)
span.LogFields(tlog.Error(fmt.Errorf("error: %v", err))) span.LogFields(
tlog.Error(fmt.Errorf("%v", err)),
tlog.String("message", "failed to execute alert rule. panic was recovered."),
)
span.Finish() span.Finish()
close(done) close(done)
} }
@ -129,7 +132,6 @@ func (e *Engine) processJob(grafanaCtx context.Context, job *Job) error {
span.SetTag("alertId", evalContext.Rule.Id) span.SetTag("alertId", evalContext.Rule.Id)
span.SetTag("dashboardId", evalContext.Rule.DashboardId) span.SetTag("dashboardId", evalContext.Rule.DashboardId)
span.SetTag("firing", evalContext.Firing) span.SetTag("firing", evalContext.Firing)
span.Finish() span.Finish()
close(done) close(done)
}() }()