From 75d2835709f78dfca8b2d482290fd5f9baf33d63 Mon Sep 17 00:00:00 2001 From: bert hubert Date: Thu, 22 Jan 2015 12:57:52 +0100 Subject: [PATCH] whitespace + better error message for ringbuffer error --- pdns/slavecommunicator.cc | 4 ---- pdns/statbag.hh | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc index 80b3ad3589..2b4d843d97 100644 --- a/pdns/slavecommunicator.cc +++ b/pdns/slavecommunicator.cc @@ -74,7 +74,6 @@ void CommunicatorClass::suck(const string &domain,const string &remote) UeberBackend *B=dynamic_cast(P.getBackend()); // copy of the same UeberBackend DNSSECKeeper dk (B); // reuse our UeberBackend copy for DNSSECKeeper - if(!B->getDomainInfo(domain, di) || !di.backend) { // di.backend and B are mostly identical L< localaddr; ComboAddress laddr; if(B->getDomainMetadata(domain, "AXFR-SOURCE", localaddr) && !localaddr.empty()) { @@ -123,7 +121,6 @@ void CommunicatorClass::suck(const string &domain,const string &remote) laddr.sin4.sin_family = 0; } - bool hadDnssecZone = false; bool hadPresigned = false; bool hadNSEC3 = false; @@ -140,7 +137,6 @@ void CommunicatorClass::suck(const string &domain,const string &remote) } } - bool isDnssecZone = false; bool isPresigned = false; bool isNSEC3 = false; diff --git a/pdns/statbag.hh b/pdns/statbag.hh index b95200a518..5adbce4544 100644 --- a/pdns/statbag.hh +++ b/pdns/statbag.hh @@ -85,7 +85,7 @@ public: { if(d_doRings) { if(!d_rings.count(name)) - throw runtime_error("Attempting to account to non-existent ring"); + throw runtime_error("Attempting to account to non-existent ring '"+std::string(name)+"'"); d_rings[name].account(item); } @@ -94,7 +94,7 @@ public: { if(d_doRings) { if(!d_comborings.count(name)) - throw runtime_error("Attempting to account to non-existent comboring"); + throw runtime_error("Attempting to account to non-existent comboring '"+std::string(name)+"'"); d_comborings[name].account(item); } } -- 2.47.2