ApiListener#RelayMessageOne(): log to which Endpoint messages are relayed

if they're for our parent Zone.

Author: Al2Klimov

lib/remote/apilistener.cpp

@@ -1204,6 +1204,20 @@ void ApiListener::SyncSendMessage(const Endpoint::Ptr& endpoint, const Dictionar
 	}
 }
 
+/**
+ * Log the endpoint currently used to relay messages to our parent zone if it (the endpoint) has changed.
+ *
+ * @param zone The parent zone
+ * @param endpoint The new endpoint
+ */
+void ApiListener::LogCurrentParentEndpoint(const Zone::Ptr& zone, const Endpoint::Ptr& endpoint)
+{
+	if (m_CurrentParentEndpoint.exchange(endpoint.get()) != endpoint.get()) {
+		Log(LogInformation, "ApiListener") << "Relaying messages for parent Zone '"
+			<< zone->GetName() << "' to Endpoint '" << endpoint->GetName() << "'";
+	}
+}
+
 /**
  * Relay a message to a directly connected zone or to a global zone.
  * If some other zone is passed as the target zone, it is not relayed.
@@ -1220,11 +1234,12 @@ bool ApiListener::RelayMessageOne(const Zone::Ptr& targetZone, const MessageOrig
 	ASSERT(targetZone);
 
 	Zone::Ptr localZone = Zone::GetLocalZone();
+	auto parentZone (localZone->GetParent());
 
 	/* only relay the message to a) the same local zone, b) the parent zone and c) direct child zones. Exception is a global zone. */
 	if (!targetZone->GetGlobal() &&
 		targetZone != localZone &&
-		targetZone != localZone->GetParent() &&
+		targetZone != parentZone &&
 		targetZone->GetParent() != localZone) {
 		return true;
 	}
@@ -1303,12 +1318,20 @@ bool ApiListener::RelayMessageOne(const Zone::Ptr& targetZone, const MessageOrig
 			bool isMaster = (currentZoneMaster == localEndpoint);
 
 			if (!isMaster && targetEndpoint != currentZoneMaster) {
+				if (currentTargetZone == parentZone) {
+					LogCurrentParentEndpoint(parentZone, currentZoneMaster);
+				}
+
 				skippedEndpoints.push_back(targetEndpoint);
 				continue;
 			}
 
 			relayed = true;
 
+			if (currentTargetZone == parentZone) {
+				LogCurrentParentEndpoint(parentZone, targetEndpoint);
+			}
+
 			SyncSendMessage(targetEndpoint, message);
 		}
 

lib/remote/apilistener.hpp

@@ -8,6 +8,7 @@
 #include "remote/httpserverconnection.hpp"
 #include "remote/endpoint.hpp"
 #include "remote/messageorigin.hpp"
+#include "base/atomic.hpp"
 #include "base/configobject.hpp"
 #include "base/process.hpp"
 #include "base/shared.hpp"
@@ -177,6 +178,7 @@ class ApiListener final : public ObjectImpl<ApiListener>
 	Timer::Ptr m_RenewOwnCertTimer;
 
 	Endpoint::Ptr m_LocalEndpoint;
+	Atomic<Endpoint*> m_CurrentParentEndpoint {nullptr};
 
 	static ApiListener::Ptr m_Instance;
 	static std::atomic<bool> m_UpdatedObjectAuthority;
@@ -206,6 +208,8 @@ class ApiListener final : public ObjectImpl<ApiListener>
 	Stream::Ptr m_LogFile;
 	size_t m_LogMessageCount{0};
 
+	void LogCurrentParentEndpoint(const Zone::Ptr& zone, const Endpoint::Ptr& endpoint);
+
 	bool RelayMessageOne(const Zone::Ptr& zone, const MessageOrigin::Ptr& origin, const Dictionary::Ptr& message, const Endpoint::Ptr& currentZoneMaster);
 	void SyncRelayMessage(const MessageOrigin::Ptr& origin, const ConfigObject::Ptr& secobj, const Dictionary::Ptr& message, bool log);
 	void PersistMessage(const Dictionary::Ptr& message, const ConfigObject::Ptr& secobj);