BIND 10 master, updated. 4beebdd9209a2a75b33068f4d1811b2664b957db [master] Update changelog for merge of 1081

[BIND 10 source code commits]

The branch, master has been updated
       via  4beebdd9209a2a75b33068f4d1811b2664b957db (commit)
       via  db55f102b30e76b72b134cbd77bd183cd01f95c0 (commit)
       via  fb95fe7735c5995f727ea42dfafcad820a3764da (commit)
      from  cb9f017de088330bd6e4107bad642b5e4ea66ce9 (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 4beebdd9209a2a75b33068f4d1811b2664b957db
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Dec 21 17:39:23 2012 +0100

    [master] Update changelog for merge of 1081

commit db55f102b30e76b72b134cbd77bd183cd01f95c0
Merge: cb9f017 fb95fe7
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Dec 21 16:59:07 2012 +0100

    [master] Merge branch 'trac1081'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                          |    7 +++++++
 src/lib/log/logger_manager_impl.cc |   10 ++++++++++
 2 files changed, 17 insertions(+)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 2636fcb..4f49868 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+535.	[bug]		jelte
+	The log4cplus internal logging mechanism has been disabled, and no
+	output from the log4cplus library itself should be printed to
+	stderr anymore. This output can be enabled by using the
+	compile-time option --enable-debug.
+	(Trac #1081, db55f102b30e76b72b134cbd77bd183cd01f95c0)
+
 534.	[func]*			vorner
 	The b10-msgq now uses the same logging format as the rest
 	of the system. However, it still doesn't obey the common
diff --git a/src/lib/log/logger_manager_impl.cc b/src/lib/log/logger_manager_impl.cc
index 6862d0c..711eae9 100644
--- a/src/lib/log/logger_manager_impl.cc
+++ b/src/lib/log/logger_manager_impl.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#include <config.h>
+
 #include <algorithm>
 #include <iostream>
 
@@ -21,6 +23,7 @@
 #include <log4cplus/consoleappender.h>
 #include <log4cplus/fileappender.h>
 #include <log4cplus/syslogappender.h>
+#include <log4cplus/helpers/loglog.h>
 
 #include <log/logger.h>
 #include <log/logger_support.h>
@@ -196,6 +199,13 @@ void LoggerManagerImpl::initRootLogger(isc::log::Severity severity,
 {
     log4cplus::Logger::getDefaultHierarchy().resetConfiguration();
 
+    // Disable log4cplus' own logging, unless --enable-debug was
+    // specified to configure. Note that this does not change
+    // LogLog's levels (that is still just INFO).
+#ifndef ENABLE_DEBUG
+    log4cplus::helpers::LogLog::getLogLog()->setQuietMode(true);
+#endif
+
     // Set the log4cplus root to not output anything - effectively we are
     // ignoring it.
     log4cplus::Logger::getRoot().setLogLevel(log4cplus::OFF_LOG_LEVEL);