Parcourir la source

[2445] Revert "Remove setLogLevel(TRACE) in createBufferAppender"

This reverts commit 3f9c7bb8a987dc1b4e2a9266ac95cf231d8fe621.
Jelte Jansen il y a 12 ans
Parent
commit
27442da448

+ 3 - 0
src/lib/log/logger_manager_impl.cc

@@ -145,6 +145,9 @@ LoggerManagerImpl::createBufferAppender(log4cplus::Logger& logger) {
     log4cplus::SharedAppenderPtr bufferapp(new internal::BufferAppender());
     bufferapp->setName("buffer");
     logger.addAppender(bufferapp);
+    // Since we do not know at what level the loggers will end up
+    // running, set it to the highest for now
+    logger.setLogLevel(log4cplus::TRACE_LOG_LEVEL);
 }
 
 // Syslog appender.

+ 5 - 5
src/lib/log/tests/buffer_logger_test.cc

@@ -22,7 +22,7 @@ using namespace isc::log;
 
 namespace {
 void usage() {
-    std::cout << "Usage: buffer_logger_test [-nv]" << std::endl;
+    std::cout << "Usage: buffer_logger_test [-n]" << std::endl;
 }
 } // end unnamed namespace
 
@@ -52,10 +52,10 @@ main(int argc, char** argv) {
         }
     }
 
-    // Note, level is set to DEBUG here, but back to INFO
-    // in process(), so when flushing to stdout (-n), the DEBUG
-    // message should show up
-    initLogger("buffertest", isc::log::DEBUG, 99, NULL, true);
+    // Note, level is INFO, so DEBUG should normally not show
+    // up. Unless process is never called (at which point it
+    // will end up in the dump at the end).
+    initLogger("buffertest", isc::log::INFO, 0, NULL, true);
     Logger logger("log");
     // No need for file interprocess locking in this test
     logger.setInterprocessSync(new isc::util::InterprocessSyncNull("logger"));