BIND 10 trac2376-callbacks, updated. 996cf7be03981de06074a9cd6632c59936d01bad [2376] Rename log IDs
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Nov 19 14:45:10 UTC 2012
The branch, trac2376-callbacks has been updated
via 996cf7be03981de06074a9cd6632c59936d01bad (commit)
via a17ef1fb8c6c0d7f58060d9ea1699f54bef1d79a (commit)
via 67a672223f008112e401dc0d19fac5932d202a8d (commit)
via a420052d0814102e518d1e737046f7949ea8b378 (commit)
from 7d0cf9b4268bd037716a980db099ebc2e6c2da36 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 996cf7be03981de06074a9cd6632c59936d01bad
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Mon Nov 19 15:44:23 2012 +0100
[2376] Rename log IDs
There are no contexts any more. Rename the log message IDs not to
contain them.
commit a17ef1fb8c6c0d7f58060d9ea1699f54bef1d79a
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Mon Nov 19 15:37:54 2012 +0100
[2376] Don't omit isc::
Mostly for consistency.
commit 67a672223f008112e401dc0d19fac5932d202a8d
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Mon Nov 19 15:32:40 2012 +0100
[2376] Split cases for add and issue tests
Use separate boolean variables to distinguish if the add callback or an
issue callback was called. The previous did not really ensure the
correct one was called.
commit a420052d0814102e518d1e737046f7949ea8b378
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Mon Nov 19 15:27:54 2012 +0100
[2376] Rename test fixture
We no longer have context, we have only bunch of callbacks.
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/datasrc_messages.mes | 4 ++--
src/lib/datasrc/loader_callbacks.cc | 18 ++++++++++--------
src/lib/datasrc/loader_callbacks.h | 6 +++---
src/lib/datasrc/tests/loader_callbacks_test.cc | 10 +++++-----
src/lib/dns/tests/loader_callbacks_test.cc | 19 ++++++++++---------
5 files changed, 30 insertions(+), 27 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/datasrc_messages.mes b/src/lib/datasrc/datasrc_messages.mes
index cf086bf..94e4140 100644
--- a/src/lib/datasrc/datasrc_messages.mes
+++ b/src/lib/datasrc/datasrc_messages.mes
@@ -305,14 +305,14 @@ Therefore, the zone will not be available for this process. If this is
a problem, you should move the zone to some database backend (sqlite3, for
example) and use it from there.
-% DATASRC_LOAD_CONTEXT_ERROR %1:%2: Zone '%3/%4' contains error: %5
+% DATASRC_MASTER_LOAD_ERROR %1:%2: Zone '%3/%4' contains error: %5
There's an error in the given master file. The zone won't be loaded for
this reason. Parsing might follow, so you might get further errors and
warnings to fix everything at once. But in case the error is serious enough,
the parser might just give up or get confused and generate false errors
afterwards.
-% DATASRC_LOAD_CONTEXT_WARN %1:%2: Zone '%3/%4' has a potential problem: %5
+% DATASRC_MASTER_LOAD_WARN %1:%2: Zone '%3/%4' has a potential problem: %5
There's something suspicious in the master file. This is a warning only.
It may be a problem or it may be harmless, but it should be checked.
This problem does not stop the zone from being loaded.
diff --git a/src/lib/datasrc/loader_callbacks.cc b/src/lib/datasrc/loader_callbacks.cc
index 856efdf..9759009 100644
--- a/src/lib/datasrc/loader_callbacks.cc
+++ b/src/lib/datasrc/loader_callbacks.cc
@@ -29,10 +29,11 @@ namespace datasrc {
namespace {
void
-logError(const dns::Name& name, const dns::RRClass& rrclass, bool* ok,
- const std::string& source, size_t line, const std::string& reason)
+logError(const isc::dns::Name& name, const isc::dns::RRClass& rrclass,
+ bool* ok, const std::string& source, size_t line,
+ const std::string& reason)
{
- LOG_ERROR(logger, DATASRC_LOAD_CONTEXT_ERROR).arg(source).arg(line).
+ LOG_ERROR(logger, DATASRC_MASTER_LOAD_ERROR).arg(source).arg(line).
arg(name).arg(rrclass).arg(reason);
if (ok != NULL) {
*ok = false;
@@ -40,18 +41,18 @@ logError(const dns::Name& name, const dns::RRClass& rrclass, bool* ok,
}
void
-logWarning(const dns::Name& name, const dns::RRClass& rrclass,
+logWarning(const isc::dns::Name& name, const isc::dns::RRClass& rrclass,
const std::string& source, size_t line, const std::string& reason)
{
- LOG_WARN(logger, DATASRC_LOAD_CONTEXT_WARN).arg(source).arg(line).
+ LOG_WARN(logger, DATASRC_MASTER_LOAD_WARN).arg(source).arg(line).
arg(name).arg(rrclass).arg(reason);
}
}
isc::dns::LoaderCallbacks
-createCallbacks(ZoneUpdater& updater, const dns::Name& name,
- const dns::RRClass& rrclass, bool* ok)
+createCallbacks(ZoneUpdater& updater, const isc::dns::Name& name,
+ const isc::dns::RRClass& rrclass, bool* ok)
{
return (isc::dns::LoaderCallbacks(boost::bind(&logError, name, rrclass, ok,
_1, _2, _3),
@@ -63,7 +64,8 @@ createCallbacks(ZoneUpdater& updater, const dns::Name& name,
// shared pointer, we need
// the object. This bind
// unpacks the object.
- boost::bind(&dns::RRsetPtr::
+ boost::bind(&isc::dns::
+ RRsetPtr::
operator*,
_1))));
}
diff --git a/src/lib/datasrc/loader_callbacks.h b/src/lib/datasrc/loader_callbacks.h
index 85eb7a8..0f074e8 100644
--- a/src/lib/datasrc/loader_callbacks.h
+++ b/src/lib/datasrc/loader_callbacks.h
@@ -40,9 +40,9 @@ class ZoneUpdater;
/// the loading, it is set to false. Otherwise, it is untouched.
/// \return Set of callbacks to be passed to the master loader.
/// \throw std::bad_alloc when allocation fails.
-dns::LoaderCallbacks
-createCallbacks(ZoneUpdater& updater, const dns::Name& name,
- const dns::RRClass& rrclass, bool* ok);
+isc::dns::LoaderCallbacks
+createCallbacks(ZoneUpdater& updater, const isc::dns::Name& name,
+ const isc::dns::RRClass& rrclass, bool* ok);
}
}
diff --git a/src/lib/datasrc/tests/loader_callbacks_test.cc b/src/lib/datasrc/tests/loader_callbacks_test.cc
index 2bacae6..28377b9 100644
--- a/src/lib/datasrc/tests/loader_callbacks_test.cc
+++ b/src/lib/datasrc/tests/loader_callbacks_test.cc
@@ -59,9 +59,9 @@ public:
std::list<isc::dns::RRsetPtr> expected_rrsets_;
};
-class LoaderContextTest : public ::testing::Test {
+class LoaderCallbackTest : public ::testing::Test {
protected:
- LoaderContextTest() :
+ LoaderCallbackTest() :
ok_(true),
callbacks_(createCallbacks(updater_, isc::dns::Name("example.org"),
isc::dns::RRClass::IN(), &ok_))
@@ -85,7 +85,7 @@ protected:
};
// Check it doesn't crash if we don't provide the OK
-TEST_F(LoaderContextTest, noOkProvided) {
+TEST_F(LoaderCallbackTest, noOkProvided) {
createCallbacks(updater_, isc::dns::Name("example.org"),
isc::dns::RRClass::IN(), NULL).error("No source", 1,
"No reason");
@@ -94,7 +94,7 @@ TEST_F(LoaderContextTest, noOkProvided) {
// Check the callbacks can be called, don't crash and the error one switches
// to non-OK mode. This, however, does not stop anybody from calling more
// callbacks.
-TEST_F(LoaderContextTest, callbacks) {
+TEST_F(LoaderCallbackTest, callbacks) {
EXPECT_NO_THROW(callbacks_.warning("No source", 1, "Just for fun"));
// The warning does not hurt the OK mode.
EXPECT_TRUE(ok_);
@@ -111,7 +111,7 @@ TEST_F(LoaderContextTest, callbacks) {
}
// Try adding some RRsets.
-TEST_F(LoaderContextTest, addRRset) {
+TEST_F(LoaderCallbackTest, addRRset) {
// Put some of them in.
EXPECT_NO_THROW(callbacks_.addRRset(generateRRset()));
EXPECT_NO_THROW(callbacks_.addRRset(generateRRset()));
diff --git a/src/lib/dns/tests/loader_callbacks_test.cc b/src/lib/dns/tests/loader_callbacks_test.cc
index c6ba978..f2686d0 100644
--- a/src/lib/dns/tests/loader_callbacks_test.cc
+++ b/src/lib/dns/tests/loader_callbacks_test.cc
@@ -30,7 +30,8 @@ using namespace isc::dns;
class LoaderCallbacksTest : public ::testing::Test {
protected:
LoaderCallbacksTest() :
- called_(false),
+ issue_called_(false),
+ add_called_(false),
rrset_(new RRset(Name("example.org"), RRClass::IN(), RRType::A(),
RRTTL(3600))),
error_(boost::bind(&LoaderCallbacksTest::checkCallback, this, true, _1,
@@ -44,18 +45,18 @@ protected:
void checkCallback(bool error, const string& source, size_t line,
const string& reason)
{
- called_ = true;
+ issue_called_ = true;
last_was_error_ = error;
EXPECT_EQ("source", source);
EXPECT_EQ(1, line);
EXPECT_EQ("reason", reason);
}
void checkAdd(const RRsetPtr& rrset) {
- called_ = true;
+ add_called_ = true;
EXPECT_EQ(rrset_, rrset);
}
bool last_was_error_;
- bool called_;
+ bool issue_called_, add_called_;
const RRsetPtr rrset_;
const LoaderCallbacks::IssueCallback error_, warning_;
const LoaderCallbacks::AddCallback add_;
@@ -78,20 +79,20 @@ TEST_F(LoaderCallbacksTest, constructor) {
TEST_F(LoaderCallbacksTest, issueCall) {
callbacks_.error("source", 1, "reason");
EXPECT_TRUE(last_was_error_);
- EXPECT_TRUE(called_);
+ EXPECT_TRUE(issue_called_);
- called_ = false;
+ issue_called_ = false;
callbacks_.warning("source", 1, "reason");
EXPECT_FALSE(last_was_error_);
- EXPECT_TRUE(called_);
+ EXPECT_TRUE(issue_called_);
}
// Call the add callback
TEST_F(LoaderCallbacksTest, addCall) {
- EXPECT_FALSE(called_);
+ EXPECT_FALSE(issue_called_);
callbacks_.addRRset(rrset_);
- EXPECT_TRUE(called_);
+ EXPECT_TRUE(add_called_);
}
More information about the bind10-changes
mailing list