Less negatives in error messages improves readability.

diff --git a/pdns/dnsdistdist/dnsdist-secpoll.cc b/pdns/dnsdistdist/dnsdist-secpoll.cc
index 179779f15d3cdeeac279f7c8e3f55448acb91879..358f943b18bae084f47ead8461577d6565829b53 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-secpoll.cc
+++ b/pdns/dnsdistdist/dnsdist-secpoll.cc
@@ -234,7 +234,7 @@ void doSecPoll(const std::string& suffix)
   }
 
   if (releaseVersion) {
-    warnlog("Could not retrieve security status update for '%s' on %s", pkgv, queriedName);
+    warnlog("Failed to retrieve security status update for '%s' on %s", pkgv, queriedName);
   }
   else if (!g_secPollDone) {
     infolog("Not validating response for security status update, this is a non-release version.");

diff --git a/pdns/recursordist/test-secpoll_cc.cc b/pdns/recursordist/test-secpoll_cc.cc
index b1f89dd345f6ac79f1e6b137f628d22f8cfdf95c..07660b08a8ced870f15673e404e3df4c3a2cf702 100644 (file)
--- a/pdns/recursordist/test-secpoll_cc.cc
+++ b/pdns/recursordist/test-secpoll_cc.cc
@@ -20,7 +20,7 @@ static bool checkBasicMessage1(const PDNSException& ex)
 
 static bool checkBasicMessage2(const PDNSException& ex)
 {
-  BOOST_CHECK_EQUAL(ex.reason, "RCODE was not NOERROR but " + RCode::to_s(1));
+  BOOST_CHECK_EQUAL(ex.reason, "RCODE was " + RCode::to_s(1));
   return true;
 }
 

diff --git a/pdns/secpoll-auth.cc b/pdns/secpoll-auth.cc
index 65ab81d3521f93594413bec4e62a88ed194842f0..435051a136da4649e871bab2ceda85b2851c3935 100644 (file)
--- a/pdns/secpoll-auth.cc
+++ b/pdns/secpoll-auth.cc
@@ -63,7 +63,7 @@ void doSecPoll(bool first)
     processSecPoll(res, ret, security_status, security_message);
   } catch(const PDNSException &pe) {
     S.set("security-status", security_status);
-    g_log<<Logger::Warning<<"Could not retrieve security status update for '" + pkgv + "' on '"+ query + "': "<<pe.reason<<endl;
+    g_log<<Logger::Warning<<"Failed to retrieve security status update for '" + pkgv + "' on '"+ query + "': "<<pe.reason<<endl;
     return;
   }
 

diff --git a/pdns/secpoll-recursor.cc b/pdns/secpoll-recursor.cc
index 2e53ec0d474c846f902c669aad3f540cc9d069aa..dbb4aa78428746082f54c3597a2d12dc4d85c328 100644 (file)
--- a/pdns/secpoll-recursor.cc
+++ b/pdns/secpoll-recursor.cc
@@ -56,7 +56,7 @@ void doSecPoll(time_t* last_secpoll)
   }
 
   if(state == Bogus) {
-    g_log<<Logger::Error<<"Could not retrieve security status update for '" +pkgv+ "' on '"<<query<<"', DNSSEC validation result was Bogus!"<<endl;
+    g_log<<Logger::Error<<"Failed to retrieve security status update for '" +pkgv+ "' on '"<<query<<"', DNSSEC validation result was Bogus!"<<endl;
     if(g_security_status == 1) // If we were OK, go to unknown
       g_security_status = 0;
     return;
@@ -74,7 +74,7 @@ void doSecPoll(time_t* last_secpoll)
     processSecPoll(res, ret, security_status, security_message);
   } catch(const PDNSException &pe) {
     g_security_status = security_status;
-    g_log<<Logger::Warning<<"Could not retrieve security status update for '" << pkgv << "' on '"<< query << "': "<<pe.reason<<endl;
+    g_log<<Logger::Warning<<"Failed to retrieve security status update for '" << pkgv << "' on '"<< query << "': "<<pe.reason<<endl;
     return;
   }
 

diff --git a/pdns/secpoll.cc b/pdns/secpoll.cc
index 77e6a08a4cf6c885dedf9867214538e89a1261df..e798a3b61fe3f2d0f3e2aeec11981a6f8f95b3ef 100644 (file)
--- a/pdns/secpoll.cc
+++ b/pdns/secpoll.cc
@@ -40,7 +40,7 @@ void processSecPoll(const int res, const std::vector<DNSRecord> &ret, int &secPo
   secPollMessage.clear();
   if (res != 0) { // not NOERROR
     setSecPollToUnknownOnOK(secPollStatus);
-    throw PDNSException("RCODE was not NOERROR but " + RCode::to_s(res));
+    throw PDNSException("RCODE was " + RCode::to_s(res));
   }
 
   if (ret.empty()) { // empty NOERROR... wat?