From: Gunnar Beutner <gunnar@beutner.name>
Date: Tue, 17 Feb 2015 14:46:03 +0000 (+0100)
Subject: Improve log messages for ApiListener::ApiTimerHandler
X-Git-Tag: v2.3.0~186
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=667b62cc3c14244173a37ead82ea43a032cc4de8;p=icinga2

Improve log messages for ApiListener::ApiTimerHandler
---

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 3fbdb30d5..e007f323f 100644
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -378,8 +378,11 @@ void ApiListener::ApiTimerHandler(void)
 
 		BOOST_FOREACH(const Zone::Ptr& zone, DynamicType::GetObjectsByType<Zone>()) {
 			/* only connect to endpoints in a) the same zone b) our parent zone c) immediate child zones */
-			if (my_zone != zone && my_zone != zone->GetParent() && zone != my_zone->GetParent())
+			if (my_zone != zone && my_zone != zone->GetParent() && zone != my_zone->GetParent()) {
+				Log(LogDebug, "ApiListener")
+				    << "Not connecting to Endpoint '" << zone->GetName() << "' because it's not in the same zone, a parent or a child zone.";
 				continue;
+			}
 
 			bool connected = false;
 
@@ -391,21 +394,33 @@ void ApiListener::ApiTimerHandler(void)
 			}
 
 			/* don't connect to an endpoint if we already have a connection to the zone */
-			if (connected)
+			if (connected) {
+				Log(LogDebug, "ApiListener")
+				    << "Not connecting to Endpoint '" << zone->GetName() << "' because we're already connected to it.";
 				continue;
+			}
 
 			BOOST_FOREACH(const Endpoint::Ptr& endpoint, zone->GetEndpoints()) {
 				/* don't connect to ourselves */
-				if (endpoint->GetName() == GetIdentity())
+				if (endpoint->GetName() == GetIdentity()) {
+					Log(LogDebug, "ApiListener")
+					    << "Not connecting to Endpoint '" << zone->GetName() << "' because that's us.";
 					continue;
+				}
 
 				/* don't try to connect to endpoints which don't have a host and port */
-				if (endpoint->GetHost().IsEmpty() || endpoint->GetPort().IsEmpty())
+				if (endpoint->GetHost().IsEmpty() || endpoint->GetPort().IsEmpty()) {
+					Log(LogDebug, "ApiListener")
+					    << "Not connecting to Endpoint '" << zone->GetName() << "' because the host/port attributes are missing.";
 					continue;
+				}
 
 				/* don't try to connect if there's already a connection attempt */
-				if (endpoint->GetConnecting())
+				if (endpoint->GetConnecting()) {
+					Log(LogDebug, "ApiListener")
+					    << "Not connecting to Endpoint '" << zone->GetName() << "' because we're already trying to connect to it.";
 					continue;
+				}
 
 				boost::thread thread(boost::bind(&ApiListener::AddConnection, this, endpoint));
 				thread.detach();