Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Less negatives in error messages improves readability. #9100

Merged
merged 1 commit into from May 14, 2020
Merged

Less negatives in error messages improves readability. #9100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pdns/dnsdistdist/dnsdist-secpoll.cc
View file
Open in desktop
Expand Up @@ -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.");
Expand Down
2 changes: 1 addition & 1 deletion pdns/recursordist/test-secpoll_cc.cc
View file
Open in desktop
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion pdns/secpoll-auth.cc
View file
Open in desktop
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions pdns/secpoll-recursor.cc
View file
Open in desktop
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion pdns/secpoll.cc
View file
Open in desktop
Expand Up @@ -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?
Expand Down