From 49b82a1d90f7afdc0812ea1a8a41cfddfc8e07ff Mon Sep 17 00:00:00 2001 From: Christian Herdtweck Date: Wed, 6 May 2015 15:32:35 +0200 Subject: [PATCH] made DNS much less talkative --- src/dns/dnscache.cpp | 30 ++++++++++++++++-------------- src/dns/dnsresolver.cpp | 28 ++++++++++++++-------------- src/icmp/icmppinger.cpp | 4 ++-- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/src/dns/dnscache.cpp b/src/dns/dnscache.cpp index b1c4f33..8e1b93f 100644 --- a/src/dns/dnscache.cpp +++ b/src/dns/dnscache.cpp @@ -117,15 +117,15 @@ void DnsCache::schedule_save(const boost::system::error_code &error) if ( error == boost::asio::error::operation_aborted ) // cancelled { - GlobalLogger.error() << "DnsCache: SaveTimer was cancelled " - << "--> no save and no re-schedule of saving!"; + GlobalLogger.info() << "DnsCache: SaveTimer was cancelled " + << "--> no save and no re-schedule of saving!"; return; } else if (error) { - GlobalLogger.error() << "DnsCache: Received error " << error - << " in schedule_save " - << "--> no save now but re-schedule saving"; + GlobalLogger.info() << "DnsCache: Received error " << error + << " in schedule_save " + << "--> no save now but re-schedule saving"; } else save_to_cachefile(); @@ -141,7 +141,7 @@ void DnsCache::save_to_cachefile() if (!HasChanged) GlobalLogger.info() << "DnsCache: skip saving because has not changed"; else if (CacheFile.empty()) - GlobalLogger.warning() + GlobalLogger.info() << "DnsCache: skip saving because file name empty!"; else if (CacheFile == DoNotUseCacheFile) GlobalLogger.info() << "DnsCache: configured not to use cache file"; @@ -170,7 +170,7 @@ void DnsCache::save_to_cachefile() void DnsCache::load_from_cachefile() { if (CacheFile.empty()) - GlobalLogger.warning() + GlobalLogger.info() << "DnsCache: cannot load because cache file name is empty!"; else if (CacheFile == DoNotUseCacheFile) GlobalLogger.info() << "DnsCache: configured not to use cache file"; @@ -212,7 +212,7 @@ std::string DnsCache::key_for_hostname(const std::string &hostname) const { if (hostname.empty()) { - GlobalLogger.warning() << "DnsCache: empty host!"; + GlobalLogger.info() << "DnsCache: empty host!"; return ""; } @@ -230,7 +230,7 @@ void DnsCache::update(const std::string &hostname, std::string key = key_for_hostname(hostname); if ( !get_cname(hostname).Host.empty() ) { // ensure that there is never IP and CNAME for the same host - GlobalLogger.warning() << "DnsCache: Saving IPs for " << key + GlobalLogger.info() << "DnsCache: Saving IPs for " << key << " removes CNAME to " << get_cname(hostname).Host << "!"; update(hostname, Cname()); // overwrite with "empty" cname } @@ -264,7 +264,7 @@ void DnsCache::update(const std::string &hostname, std::string key = key_for_hostname(hostname); if ( !get_ips(hostname).empty() ) { // ensure that there is never IP and CNAME for the same host - GlobalLogger.warning() << "DnsCache: Saving CNAME for " << key + GlobalLogger.info() << "DnsCache: Saving CNAME for " << key << " removes " << get_ips(hostname).size() << " IPs for same host!"; update(hostname, HostAddressVec()); // overwrite with empty IP list } @@ -379,8 +379,9 @@ HostAddressVec DnsCache::get_ips_recursive(const std::string &hostname, current_host = key_for_hostname(current_cname.Host); if (++n_recursions >= max_recursion_count) { - GlobalLogger.warning() << "DnsCache: reached recursion limit of " - << n_recursions << " in recursive IP retrieval!"; + GlobalLogger.info() << "DnsCache: reached recursion limit of " + << n_recursions << " in recursive IP retrieval of " + << hostname << "!"; break; } else @@ -433,8 +434,9 @@ std::string DnsCache::get_first_outdated_cname(const std::string &hostname, { if (++n_recursions >= max_recursion_count) { - GlobalLogger.warning() << "DnsCache: reached recursion limit of " - << n_recursions << " in search of outdated CNAMEs!"; + GlobalLogger.info() << "DnsCache: reached recursion limit of " + << n_recursions << " in search of outdated CNAMEs for " + << hostname << "!"; return first_outdated; // not really out of date but currently } // our best guess diff --git a/src/dns/dnsresolver.cpp b/src/dns/dnsresolver.cpp index 634a439..eb05126 100644 --- a/src/dns/dnsresolver.cpp +++ b/src/dns/dnsresolver.cpp @@ -85,15 +85,15 @@ DnsResolver::~DnsResolver() boost::system::error_code error; //Socket.shutdown(boost::asio::ip::udp::socket::shutdown_both, error); //if ( error ) - // GlobalLogger.warning() << LogPrefix << "Received error " << error + // GlobalLogger.info() << LogPrefix << "Received error " << error // << " when shutting down socket for DNS"; // in IcmpPinger always gave an error system:9 (EBADF: Bad file descriptor) // Here gives error system:107 ENOTCONN: Transport endpoint is not connected Socket.close(error); if ( error ) - GlobalLogger.warning() << LogPrefix << "Received error " << error - << " when closing socket for DNS"; + GlobalLogger.info() << LogPrefix << "Received error " << error + << " when closing socket for DNS"; } @@ -169,7 +169,7 @@ void DnsResolver::do_resolve(const int recursion_count) } catch (boost::system::system_error &err) { - GlobalLogger.warning() << LogPrefix + GlobalLogger.info() << LogPrefix << "Sending of DNS request message failed: " << err.what(); schedule_retry(recursion_count); @@ -178,7 +178,7 @@ void DnsResolver::do_resolve(const int recursion_count) if ( bytes_sent == 0 ) { - GlobalLogger.warning() << LogPrefix << "Empty DNS request sent!"; + GlobalLogger.info() << LogPrefix << "Empty DNS request sent!"; schedule_retry(recursion_count); return; } @@ -214,7 +214,7 @@ void DnsResolver::handle_dns_result(const int recursion_count, // check ID if (RequestId != result_message.id()) - GlobalLogger.warning() << LogPrefix << "Received answer for request ID " + GlobalLogger.info() << LogPrefix << "Received answer for request ID " << std::showbase << std::hex << result_message.id() << " but expected ID " << RequestId; else @@ -249,7 +249,7 @@ void DnsResolver::handle_dns_result(const int recursion_count, handle_cname(recursion_count, result_cnames); else { // no answers --> cannot proceed - GlobalLogger.warning() << LogPrefix << "No IP nor CNAME received! " + GlobalLogger.info() << LogPrefix << "No IP nor CNAME received! " << "--> request retry"; schedule_retry(recursion_count); } @@ -387,13 +387,13 @@ void DnsResolver::handle_ips(const int recursion_count, BOOST_FOREACH( const host_addr_pair &host_and_addr, result_ips) { if ( host_and_addr.first != only_host_for_ips ) - GlobalLogger.warning() << LogPrefix + GlobalLogger.info() << LogPrefix << "Received IPs for different hosts " << only_host_for_ips << " and " << host_and_addr.first << " in one DNS result! " << "--> ignore second"; else { - GlobalLogger.notice() << LogPrefix << "Found IP " + GlobalLogger.info() << LogPrefix << "Found IP " << host_and_addr.second.get_ip() << " with TTL " << host_and_addr.second.get_ttl().get_value() << "s"; addr_list.push_back(host_and_addr.second); @@ -438,7 +438,7 @@ void DnsResolver::handle_cname(const int recursion_count, if (last_cname.empty()) { - GlobalLogger.error() << LogPrefix + GlobalLogger.info() << LogPrefix << "Could not identify \"last\" CNAME to handle -- " << "maybe we encountered a CNAME loop? Anyway, cannot proceed!"; GlobalLogger.info() << LogPrefix << "Result CNAMEs were:"; @@ -542,7 +542,7 @@ void DnsResolver::finalize_resolve(const bool was_success, ResolverBase::schedule_callbacks(was_success, recursion_count); // finalize - GlobalLogger.notice() << LogPrefix << "finalized resolve" + GlobalLogger.info() << LogPrefix << "finalized resolve" << " with success = " << was_success << " and recursion_count = " << recursion_count; IsResolving = false; @@ -655,7 +655,7 @@ void DnsResolver::handle_resolve_timeout(const int recursion_count, } else if (error) { - GlobalLogger.warning() << LogPrefix + GlobalLogger.info() << LogPrefix << "resolve timeout handler received error " << error << " --> request retry"; schedule_retry(recursion_count); @@ -668,7 +668,7 @@ void DnsResolver::handle_resolve_timeout(const int recursion_count, } else { - GlobalLogger.notice() << LogPrefix << "DNS resolving timed out"; + GlobalLogger.info() << LogPrefix << "DNS resolving timed out"; schedule_retry(recursion_count); } } @@ -715,7 +715,7 @@ void DnsResolver::wait_timer_timeout_handler( const int recursion_count, else if (error) { // not sure what to do here, but callers waiting forever for a callback // is probably the worst thing to happen, so call finalize_resolve - GlobalLogger.warning() << LogPrefix + GlobalLogger.info() << LogPrefix << "resolve wait handler received error " << error << "! Try to finalize resolve"; bool was_success = false; diff --git a/src/icmp/icmppinger.cpp b/src/icmp/icmppinger.cpp index 49a16d0..8b85702 100644 --- a/src/icmp/icmppinger.cpp +++ b/src/icmp/icmppinger.cpp @@ -595,8 +595,8 @@ void IcmpPacketDistributor::clean_up_all() void IcmpPacketDistributor::clean_up() { if (PingerList.size() == 0) - GlobalLogger.notice() << "All IcmpPingers have de-registered :-)" - << std::endl; + GlobalLogger.info() << "All IcmpPingers have de-registered" + << std::endl; else GlobalLogger.warning() << "There were still " << PingerList.size() << " pingers registered in IcmpPacketDistributor!" << std::endl; -- 1.7.1