BIND 10 master, updated. a3e59452b950dce4866fb62e36b1af2e6e9037db [master] Add .gitignore files
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Aug 2 05:02:04 UTC 2012
The branch, master has been updated
via a3e59452b950dce4866fb62e36b1af2e6e9037db (commit)
via 9e4e068087b0f06a04fedfcfb0faa2c2113c4723 (commit)
via 7d7e5269d57451191c0aef1b127d292d3615fe2c (commit)
via 3378f9b44d6d8a5cceedd9b9f6177d77985a01bf (commit)
from 4f42de9d8aefb697c2a0eb85ae3125030a3f77f8 (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 a3e59452b950dce4866fb62e36b1af2e6e9037db
Author: Mukund Sivaraman <muks at isc.org>
Date: Thu Aug 2 10:29:14 2012 +0530
[master] Add .gitignore files
commit 9e4e068087b0f06a04fedfcfb0faa2c2113c4723
Author: Mukund Sivaraman <muks at isc.org>
Date: Thu Aug 2 10:27:02 2012 +0530
[2169] Update ChangeLog
commit 7d7e5269d57451191c0aef1b127d292d3615fe2c
Merge: 3378f9b 4f42de9
Author: Mukund Sivaraman <muks at isc.org>
Date: Thu Aug 2 10:20:50 2012 +0530
Merge branch 'master' into trac2169
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
.../auth/tests}/testdata/.gitignore | 7 -------
src/bin/cfgmgr/plugins/.gitignore | 2 ++
.../auth => lib/datasrc/memory}/tests/.gitignore | 0
src/lib/log/logger_impl.cc | 1 +
src/lib/log/logger_level_impl.cc | 8 +++++---
src/lib/log/logger_level_impl.h | 9 ++++++++-
src/lib/log/logger_manager_impl.cc | 1 +
8 files changed, 22 insertions(+), 11 deletions(-)
copy src/{lib/testutils => bin/auth/tests}/testdata/.gitignore (56%)
create mode 100644 src/bin/cfgmgr/plugins/.gitignore
copy src/{bin/auth => lib/datasrc/memory}/tests/.gitignore (100%)
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 948aafb..7073922 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+456. [bug] muks
+ BIND 10 now compiles against log4cplus-1.1.0 (RC releases)
+ also. Thanks to John Lumby for sending a patch.
+ (Trac #2169, git 7d7e5269d57451191c0aef1b127d292d3615fe2c)
+
455. [func]* vorner
The server now uses newer API for data sources. This would be an
internal change, however, the data sources are now configured
diff --git a/src/bin/auth/tests/testdata/.gitignore b/src/bin/auth/tests/testdata/.gitignore
new file mode 100644
index 0000000..b2e0e50
--- /dev/null
+++ b/src/bin/auth/tests/testdata/.gitignore
@@ -0,0 +1,8 @@
+/badExampleQuery_fromWire.wire
+/examplequery_fromWire.wire
+/iqueryresponse_fromWire.wire
+/multiquestion_fromWire.wire
+/queryBadEDNS_fromWire.wire
+/shortanswer_fromWire.wire
+/simplequery_fromWire.wire
+/simpleresponse_fromWire.wire
diff --git a/src/bin/cfgmgr/plugins/.gitignore b/src/bin/cfgmgr/plugins/.gitignore
new file mode 100644
index 0000000..9641e02
--- /dev/null
+++ b/src/bin/cfgmgr/plugins/.gitignore
@@ -0,0 +1,2 @@
+/datasrc.spec
+/datasrc.spec.pre
diff --git a/src/lib/datasrc/memory/tests/.gitignore b/src/lib/datasrc/memory/tests/.gitignore
new file mode 100644
index 0000000..d6d1ec8
--- /dev/null
+++ b/src/lib/datasrc/memory/tests/.gitignore
@@ -0,0 +1 @@
+/run_unittests
diff --git a/src/lib/log/logger_impl.cc b/src/lib/log/logger_impl.cc
index 2d6c0f4..6cd3da5 100644
--- a/src/lib/log/logger_impl.cc
+++ b/src/lib/log/logger_impl.cc
@@ -22,6 +22,7 @@
#include <boost/static_assert.hpp>
#include <log4cplus/configurator.h>
+#include <log4cplus/loggingmacros.h>
#include <log/logger.h>
#include <log/logger_impl.h>
diff --git a/src/lib/log/logger_level_impl.cc b/src/lib/log/logger_level_impl.cc
index 397f6d4..bfc4748 100644
--- a/src/lib/log/logger_level_impl.cc
+++ b/src/lib/log/logger_level_impl.cc
@@ -185,20 +185,22 @@ LoggerLevelImpl::logLevelFromString(const log4cplus::tstring& level) {
// Convert logging level to string. If the level is a valid debug level,
// return the string DEBUG, else return the empty string.
-log4cplus::tstring
+LoggerLevelImpl::LogLevelString
LoggerLevelImpl::logLevelToString(log4cplus::LogLevel level) {
+ static const tstring debug_string("DEBUG");
+ static const tstring empty_string;
Level bindlevel = convertToBindLevel(level);
Severity& severity = bindlevel.severity;
int& dbglevel = bindlevel.dbglevel;
if ((severity == DEBUG) &&
((dbglevel >= MIN_DEBUG_LEVEL) && (dbglevel <= MAX_DEBUG_LEVEL))) {
- return (tstring("DEBUG"));
+ return (debug_string);
}
// Unknown, so return empty string for log4cplus to try other conversion
// functions.
- return (tstring());
+ return (empty_string);
}
// Initialization. Register the conversion functions with the LogLevelManager.
diff --git a/src/lib/log/logger_level_impl.h b/src/lib/log/logger_level_impl.h
index c990796..17b866d 100644
--- a/src/lib/log/logger_level_impl.h
+++ b/src/lib/log/logger_level_impl.h
@@ -16,6 +16,7 @@
#define __LOGGER_LEVEL_IMPL_H
#include <log4cplus/logger.h>
+#include <log4cplus/version.h>
#include <log/logger_level.h>
namespace isc {
@@ -65,6 +66,12 @@ namespace log {
class LoggerLevelImpl {
public:
+#if (LOG4CPLUS_VERSION >= LOG4CPLUS_MAKE_VERSION(1, 1, 0))
+ typedef log4cplus::tstring const & LogLevelString;
+#else
+ typedef log4cplus::tstring LogLevelString;
+#endif
+
/// \brief Convert BIND 10 level to log4cplus logging level
///
/// Converts the BIND 10 severity level into a log4cplus logging level.
@@ -112,7 +119,7 @@ public:
/// \param level Extended logging level
///
/// \return Equivalent string.
- static log4cplus::tstring logLevelToString(log4cplus::LogLevel level);
+ static LogLevelString logLevelToString(log4cplus::LogLevel level);
/// \brief Initialize extended logging levels
///
diff --git a/src/lib/log/logger_manager_impl.cc b/src/lib/log/logger_manager_impl.cc
index 68f2bb8..1af40c1 100644
--- a/src/lib/log/logger_manager_impl.cc
+++ b/src/lib/log/logger_manager_impl.cc
@@ -17,6 +17,7 @@
#include <log4cplus/logger.h>
#include <log4cplus/configurator.h>
+#include <log4cplus/hierarchy.h>
#include <log4cplus/consoleappender.h>
#include <log4cplus/fileappender.h>
#include <log4cplus/syslogappender.h>
More information about the bind10-changes
mailing list