From 4049e84f5f1cc624f8b7ce845aafa97489f047cd Mon Sep 17 00:00:00 2001
From: glanchow <glanchow@gmail.com>
Date: Tue, 2 Nov 2021 16:48:52 +0100
Subject: [PATCH 1/3] Reset notifyAfterCount on Success

---
 types/services/notifications.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/services/notifications.go b/types/services/notifications.go
index f8ee67b1..ccf72703 100644
--- a/types/services/notifications.go
+++ b/types/services/notifications.go
@@ -44,7 +44,7 @@ func sendSuccess(s *Service) {
 	}
 
 	s.prevOnline = true
-	s.notifyAfterCount++
+	s.notifyAfterCount = 0
 }
 
 func sendFailure(s *Service, f *failures.Failure) {

From a8a2ef85b7bbb322a6c3d68b816f3e061215b2c5 Mon Sep 17 00:00:00 2001
From: glanchow <glanchow@gmail.com>
Date: Fri, 5 Nov 2021 11:54:04 +0100
Subject: [PATCH 2/3] Remove unnecessary notification counter increment

---
 types/services/notifications.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/services/notifications.go b/types/services/notifications.go
index ccf72703..fd302434 100644
--- a/types/services/notifications.go
+++ b/types/services/notifications.go
@@ -80,7 +80,6 @@ func sendFailure(s *Service, f *failures.Failure) {
 	}
 
 	s.prevOnline = false
-	s.notifyAfterCount++
 }
 
 func logMessage(method string, msg string, error error, onSuccesss bool, serviceId int64) {

From 6a8026067f4f66459f35f9b0716249cd4cfe3c07 Mon Sep 17 00:00:00 2001
From: Guillaume LAN CHOW WING <glanchow@gmail.com>
Date: Fri, 26 Nov 2021 12:01:51 +0100
Subject: [PATCH 3/3] Notifications afterCount reorder

---
 types/services/notifications.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/services/notifications.go b/types/services/notifications.go
index fd302434..c8a71374 100644
--- a/types/services/notifications.go
+++ b/types/services/notifications.go
@@ -23,9 +23,12 @@ func sendSuccess(s *Service) {
 		return
 	}
 
+	s.notifyAfterCount = 0
+
 	if s.prevOnline == s.Online {
 		return
 	}
+	s.prevOnline = true
 
 	for _, n := range allNotifiers {
 		notif := n.Select()
@@ -42,9 +45,6 @@ func sendSuccess(s *Service) {
 			notif.LastSent = utils.Now()
 		}
 	}
-
-	s.prevOnline = true
-	s.notifyAfterCount = 0
 }
 
 func sendFailure(s *Service, f *failures.Failure) {
@@ -63,6 +63,8 @@ func sendFailure(s *Service, f *failures.Failure) {
 		}
 	}
 
+	s.prevOnline = false
+
 	for _, n := range allNotifiers {
 		notif := n.Select()
 		if notif.CanSend() {
@@ -78,8 +80,6 @@ func sendFailure(s *Service, f *failures.Failure) {
 			notif.LastSent = utils.Now()
 		}
 	}
-
-	s.prevOnline = false
 }
 
 func logMessage(method string, msg string, error error, onSuccesss bool, serviceId int64) {