From ca33622698fd3dcc2be1144582b809d8deff6faf Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 13 Jun 2016 14:54:06 +0200 Subject: [PATCH] style(alerting): rename max retries --- pkg/services/alerting/alerting.go | 2 +- pkg/services/alerting/engine.go | 2 +- pkg/services/alerting/models.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/services/alerting/alerting.go b/pkg/services/alerting/alerting.go index 37b7e13d3c0..01459844b05 100644 --- 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 index 67910830776..88ab0aaf700 100644 --- 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 index a815a87d3d0..bbc387fa5db 100644 --- 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() {