]> granicus.if.org Git - icinga2/commitdiff
Improve log messages for ApiListener::ApiTimerHandler
authorGunnar Beutner <gunnar@beutner.name>
Tue, 17 Feb 2015 14:46:03 +0000 (15:46 +0100)
committerGunnar Beutner <gunnar@beutner.name>
Tue, 17 Feb 2015 14:46:29 +0000 (15:46 +0100)
lib/remote/apilistener.cpp

index 3fbdb30d50e230df5fc55804f2534f2b9ef966b8..e007f323ffd7ab0c9a674109de4fe81514460390 100644 (file)
@@ -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();