From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Wed, 10 Jul 2019 10:34:40 +0000 (+0200)
Subject: Config sync: Count the updates and log them
X-Git-Tag: v2.11.0-rc1~25^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b00e1d0c6777e509a397931cb4a6646fae0181ba;p=icinga2

Config sync: Count the updates and log them

```
[2019-07-10 12:34:27 +0200] information/ApiListener: Received configuration updates (2) from endpoint 'master1' are equal to production, not triggering reload.
```
---

diff --git a/lib/remote/apilistener-filesync.cpp b/lib/remote/apilistener-filesync.cpp
index d1048ff6d..5d1412bc2 100644
--- a/lib/remote/apilistener-filesync.cpp
+++ b/lib/remote/apilistener-filesync.cpp
@@ -301,6 +301,8 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
 	Utility::MkDirP(apiZonesStageDir, 0700);
 
 	// Analyse and process the update.
+	size_t count = 0;
+
 	ObjectLock olock(updateV1);
 
 	for (const Dictionary::Pair& kv : updateV1) {
@@ -480,6 +482,8 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
 				}
 			}
 		}
+
+		count++;
 	}
 
 	/*
@@ -493,13 +497,13 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
 	 */
 	if (configChange) {
 		Log(LogInformation, "ApiListener")
-			<< "Received configuration from endpoint '" << fromEndpointName
-			<< "' is different to production, triggering validation and reload.";
+			<< "Received configuration updates (" << count << ") from endpoint '" << fromEndpointName
+			<< "' are different to production, triggering validation and reload.";
 		AsyncTryActivateZonesStage(relativePaths);
 	} else {
 		Log(LogInformation, "ApiListener")
-			<< "Received configuration from endpoint '" << fromEndpointName
-			<< "' is equal to production, not triggering reload.";
+			<< "Received configuration updates (" << count << ") from endpoint '" << fromEndpointName
+			<< "' are equal to production, not triggering reload.";
 	}
 
 	return Empty;