feat(alerting): rename state response method

bergquist · bergquist · commit 6edae37ac96f · 2016-06-22T07:23:31.000+02:00
diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go
@@ -121,20 +121,19 @@ func (e *Engine) resultHandler() {
 
 				result.State = alertstates.Critical
 				result.Description = fmt.Sprintf("Failed to run check after %d retires, Error: %v", maxAlertExecutionRetries, result.Error)
-				e.saveState(result)
+				e.reactToState(result)
 			}
 		} else {
 			result.AlertJob.ResetRetry()
-			e.saveState(result)
+			e.reactToState(result)
 		}
 	}
 }
 
-func (e *Engine) saveState(result *AlertResult) {
+func (e *Engine) reactToState(result *AlertResult) {
 	query := &m.GetAlertByIdQuery{Id: result.AlertJob.Rule.Id}
 	bus.Dispatch(query)
 
-	e.notifier.Notify(result)
 	if query.Result.ShouldUpdateState(result.State) {
 		cmd := &m.UpdateAlertStateCommand{
 			AlertId:  result.AlertJob.Rule.Id,
@@ -146,9 +145,7 @@ func (e *Engine) saveState(result *AlertResult) {
 			e.log.Error("Failed to save state", "error", err)
 		}
 
-		e.log.Debug("will notify! about", "new state", result.State)
-
-	} else {
-		e.log.Debug("state remains the same!")
+		e.log.Debug("will notify about new state", "new state", result.State)
+		e.notifier.Notify(result)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -121,20 +121,19 @@ func (e *Engine) resultHandler() {`
`121`	`121`
`122`	`122`	`result.State = alertstates.Critical`
`123`	`123`	`result.Description = fmt.Sprintf("Failed to run check after %d retires, Error: %v", maxAlertExecutionRetries, result.Error)`
`124`		`- e.saveState(result)`
	`124`	`+ e.reactToState(result)`
`125`	`125`	`}`
`126`	`126`	`} else {`
`127`	`127`	`result.AlertJob.ResetRetry()`
`128`		`- e.saveState(result)`
	`128`	`+ e.reactToState(result)`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`133`		`-func (e Engine) saveState(result AlertResult) {`
	`133`	`+func (e Engine) reactToState(result AlertResult) {`
`134`	`134`	`query := &m.GetAlertByIdQuery{Id: result.AlertJob.Rule.Id}`
`135`	`135`	`bus.Dispatch(query)`
`136`	`136`
`137`		`- e.notifier.Notify(result)`
`138`	`137`	`if query.Result.ShouldUpdateState(result.State) {`
`139`	`138`	`cmd := &m.UpdateAlertStateCommand{`
`140`	`139`	`AlertId: result.AlertJob.Rule.Id,`
`@@ -146,9 +145,7 @@ func (e Engine) saveState(result AlertResult) {`
`146`	`145`	`e.log.Error("Failed to save state", "error", err)`
`147`	`146`	`}`
`148`	`147`
`149`		`- e.log.Debug("will notify! about", "new state", result.State)`
`150`		`-`
`151`		`- } else {`
`152`		`- e.log.Debug("state remains the same!")`
	`148`	`+ e.log.Debug("will notify about new state", "new state", result.State)`
	`149`	`+ e.notifier.Notify(result)`
`153`	`150`	`}`
`154`	`151`	`}`