diff --git a/pkg/services/alerting/eval_handler.go b/pkg/services/alerting/eval_handler.go index 3abcd978064..e251278e7e1 100644 --- a/pkg/services/alerting/eval_handler.go +++ b/pkg/services/alerting/eval_handler.go @@ -21,7 +21,6 @@ func NewEvalHandler() *DefaultEvalHandler { } func (e *DefaultEvalHandler) Eval(context *EvalContext) { - go e.eval(context) select { @@ -32,11 +31,9 @@ func (e *DefaultEvalHandler) Eval(context *EvalContext) { case <-context.DoneChan: e.log.Debug("Job Execution done", "timeMs", context.GetDurationMs(), "alertId", context.Rule.Id, "firing", context.Firing) } - } func (e *DefaultEvalHandler) eval(context *EvalContext) { - for _, condition := range context.Rule.Conditions { condition.Eval(context) diff --git a/pkg/services/alerting/eval_handler_test.go b/pkg/services/alerting/eval_handler_test.go index 039e9be9a30..ae5b4e4501d 100644 --- a/pkg/services/alerting/eval_handler_test.go +++ b/pkg/services/alerting/eval_handler_test.go @@ -40,6 +40,5 @@ func TestAlertingExecutor(t *testing.T) { handler.eval(context) So(context.Firing, ShouldEqual, false) }) - }) }