style(alerting): rename max retries

bergquist · bergquist · commit ca33622698fd · 2016-06-13T14:54:06.000+02:00
diff --git a/pkg/services/alerting/alerting.go b/pkg/services/alerting/alerting.go
@@ -6,7 +6,7 @@ import (
 )
 
 var (
-	maxRetries = 3
+	maxAlertExecutionRetries = 3
 )
 
 var engine *Engine
diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go
@@ -118,7 +118,7 @@ func (e *Engine) resultHandler() {
 				e.log.Error("Alert Rule Result Error After Max Retries", "ruleId", result.AlertJob.Rule.Id, "error", result.Error, "retry", result.AlertJob.RetryCount)
 
 				result.State = alertstates.Critical
-				result.Description = fmt.Sprintf("Failed to run check after %d retires, Error: %v", maxRetries, result.Error)
+				result.Description = fmt.Sprintf("Failed to run check after %d retires, Error: %v", maxAlertExecutionRetries, result.Error)
 				e.saveState(result)
 			}
 		} else {
diff --git a/pkg/services/alerting/models.go b/pkg/services/alerting/models.go
@@ -9,7 +9,7 @@ type AlertJob struct {
 }
 
 func (aj *AlertJob) Retryable() bool {
-	return aj.RetryCount < maxRetries
+	return aj.RetryCount < maxAlertExecutionRetries
 }
 
 func (aj *AlertJob) ResetRetry() {

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func (e *Engine) resultHandler() {`
`118`	`118`	`e.log.Error("Alert Rule Result Error After Max Retries", "ruleId", result.AlertJob.Rule.Id, "error", result.Error, "retry", result.AlertJob.RetryCount)`
`119`	`119`
`120`	`120`	`result.State = alertstates.Critical`
`121`		`- result.Description = fmt.Sprintf("Failed to run check after %d retires, Error: %v", maxRetries, result.Error)`
	`121`	`+ result.Description = fmt.Sprintf("Failed to run check after %d retires, Error: %v", maxAlertExecutionRetries, result.Error)`
`122`	`122`	`e.saveState(result)`
`123`	`123`	`}`
`124`	`124`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ type AlertJob struct {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`func (aj *AlertJob) Retryable() bool {`
`12`		`- return aj.RetryCount < maxRetries`
	`12`	`+ return aj.RetryCount < maxAlertExecutionRetries`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`func (aj *AlertJob) ResetRetry() {`