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

if they're for our parent Zone.

Author: Al2Klimov

lib/remote/apilistener.cpp

@@ -1220,11 +1220,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 +1304,26 @@ bool ApiListener::RelayMessageOne(const Zone::Ptr& targetZone, const MessageOrig
 			bool isMaster = (currentZoneMaster == localEndpoint);
 
 			if (!isMaster && targetEndpoint != currentZoneMaster) {
+				if (currentTargetZone == parentZone) {
+					if (m_CurrentParentEndpoint.exchange(currentZoneMaster.get()) != currentZoneMaster.get()) {
+						Log(LogInformation, "ApiListener") << "Relaying messages for parent Zone '"
+							<< parentZone->GetName() << "' to Endpoint '" << currentZoneMaster->GetName() << "'";
+					}
+				}
+
 				skippedEndpoints.push_back(targetEndpoint);
 				continue;
 			}
 
 			relayed = true;
 
+			if (currentTargetZone == parentZone) {
+				if (m_CurrentParentEndpoint.exchange(targetEndpoint.get()) != targetEndpoint.get()) {
+					Log(LogInformation, "ApiListener") << "Relaying messages for parent Zone '"
+						<< parentZone->GetName() << "' to Endpoint '" << targetEndpoint->GetName() << "'";
+				}
+			}
+
 			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;