IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(alerting): dont allow alert responses to cancel

Browse Source
This commit is contained in:
bergquist 2016-09-30 14:29:30 +02:00
parent 0d86b8288d
commit 324b006c96
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,10 +95,22 @@ func (e *Engine) processJob(grafanaCtx context.Context, job *Job) error {
job.Running = true
evalContext := NewEvalContext(grafanaCtx, job.Rule)
e.evalHandler.Eval(evalContext)
e.resultHandler.Handle(evalContext)
e.log.Debug("Job Execution completed", "timeMs", evalContext.GetDurationMs(), "alertId", evalContext.Rule.Id, "name", evalContext.Rule.Name, "firing", evalContext.Firing)
evalDone := make(chan struct{})
go func() {
e.evalHandler.Eval(evalContext)
close(evalDone)
}()
var err error = nil
select {
case <-grafanaCtx.Done():
err = grafanaCtx.Err()
case <-evalDone:
err = e.resultHandler.Handle(evalContext)
}
e.log.Debug("Job Execution completed", "timeMs", evalContext.GetDurationMs(), "alertId", evalContext.Rule.Id, "name", evalContext.Rule.Name, "firing", evalContext.Firing)
job.Running = false
return evalContext.Error
return err
}