feat(alerting): dont allow alert responses to cancel

bergquist · bergquist · commit 324b006c9668 · 2016-09-30T14:29:30.000+02:00
diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go
@@ -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
 }
