From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat, 11 Apr 2020 05:21:43 +0000 (-0500)
Subject: log: Fix repetition check
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0ba8655c2e54c74548edf4cabc103f47710fd7d;p=thirdparty%2Ffreeradius-server.git

log: Fix repetition check
---

diff --git a/src/lib/server/log.h b/src/lib/server/log.h
index d94c924d0b6..fed21980f49 100644
--- a/src/lib/server/log.h
+++ b/src/lib/server/log.h
@@ -475,13 +475,15 @@ do {\
 		(_entry)->now = time(NULL);\
 		if ((_entry)->now != (_entry)->last_complained) {\
 			(_entry)->last_complained = (_entry)->now;\
-			if ((_entry)->repeated > 0) { \
+			if (((_entry)->repeated > 0) && (((_entry)->now - (_entry)->last_complained) == 1)) { \
 				_log(_fmt " - repeated %u time(s)", ##__VA_ARGS__, (_entry)->repeated); \
 				(_entry)->repeated = 0; \
 			} else { \
 				_log(_fmt, ##__VA_ARGS__); \
 			}\
-		}\
+		} else { \
+			(_entry)->repeated++; \
+		} \
 	} else (_log(_fmt, ##__VA_ARGS__));\
 } while (0)
 
@@ -510,13 +512,15 @@ do {\
 		(_entry)->now = time(NULL);\
 		if ((_entry)->now != (_entry)->last_complained) {\
 			(_entry)->last_complained = (_entry)->now;\
-			if ((_entry)->repeated > 0) { \
+			if (((_entry)->repeated > 0) && (((_entry)->now - (_entry)->last_complained) == 1)) { \
 				ROPTIONAL(_l_request, _l_global, _fmt " - repeated %u time(s)", ##__VA_ARGS__, (_entry)->repeated); \
 				(_entry)->repeated = 0; \
 			} else { \
 				ROPTIONAL(_l_request, _l_global, _fmt, ##__VA_ARGS__); \
 			}\
-		}\
+		} else { \
+			(_entry)->repeated++; \
+		} \
 	} else { \
 		ROPTIONAL(_l_request, _l_global, _fmt, ##__VA_ARGS__);\
 	} \