From fec4da3f61356e71268cd907c19a58472e09e4e0 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Wed, 3 Sep 2014 00:22:07 +0200 Subject: [PATCH] Fix retry count in recovery notifications --- picomon/checks.py | 4 ++-- picomon/mails.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/picomon/checks.py b/picomon/checks.py index d274c8b..b007d60 100644 --- a/picomon/checks.py +++ b/picomon/checks.py @@ -67,8 +67,8 @@ class Check(object): self.setup() if not self.check(): logging.debug('Fail: ' + str(self)) - self.retry_count = min(self.retry_count + 1, self.retry) - if self.retry_count == self.retry or immediate: + self.retry_count += 1 + if self.retry_count >= self.retry or immediate: if self.ok: logging.debug('Switched to failure: ' + str(self)) self.failure_date = datetime.now() diff --git a/picomon/mails.py b/picomon/mails.py index 15ee00f..d006045 100644 --- a/picomon/mails.py +++ b/picomon/mails.py @@ -105,7 +105,7 @@ def send_email_for_check(check): delta = datetime.now() - check.failure_date # remove microsec delta = delta - timedelta(microseconds=delta.microseconds) - n = delta // timedelta(seconds=check.error_every * config.base_tick) + n = check.retry_count + 1 - check.retry msg_text += ("recovered after %s (%d %s)." % (delta, n, "retry" if n == 1 else "retries")) else: -- GitLab