From: Christian Herdtweck <christian.herdtweck@intra2net.com>
Date: Wed, 15 Jul 2015 11:27:25 +0000 (+0200)
Subject: remove consistency check for empty callback list in finalize_resolve
X-Git-Url: http://developer.intra2net.com/git/?p=pingcheck;a=commitdiff_plain;h=ed8542a5e53952d44e2df8cbcf08594c9a86676a

remove consistency check for empty callback list in finalize_resolve

empty list possible and ok if resolving was initiated by long-term timer
---

diff --git a/src/dns/dnsresolver.cpp b/src/dns/dnsresolver.cpp
index b9e7af6..56d2112 100644
--- a/src/dns/dnsresolver.cpp
+++ b/src/dns/dnsresolver.cpp
@@ -552,10 +552,7 @@ void DnsResolver::finalize_resolve(const bool was_success,
                                             << "not resolving any more!";
     if ( OperationCancelled )
         GlobalLogger.warning() << LogPrefix << "Consistency check failed: "
-                                            << " was cancelled!";
-    if ( ResolverBase::CallbackList.empty() )
-        GlobalLogger.warning() << LogPrefix << "Consistency check failed: "
-                                            << "no callbacks!";
+                                            << "was cancelled!";
     if ( RequestId != 0 )
         GlobalLogger.warning() << LogPrefix << "Consistency check failed: "
                                             << "waiting for DNS reply!";
@@ -754,7 +751,8 @@ void DnsResolver::wait_timer_timeout_handler( const int recursion_count,
     }
     else
     {
-        GlobalLogger.info() << LogPrefix << "Done waiting --> re-try resolve";
+        GlobalLogger.info() << LogPrefix
+                            << "Long-term timer expired --> re-try resolve";
         IsResolving = false;  // will be set to true immediately in do_resolve
         do_resolve(recursion_count);
     }