[2445] Rename log_buffer and its namespace

To prevent accidental outside use, all LogBugger (and BufferAppender) code is in the namespace isc::log::internal now, and the files have been renamed to _impl

diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am
index 4a621cbe04cbbe14ea54074cf69a54b6da458cd6..e9074f8198348bd377c2a7446e48eb45aaf2f278 100644 (file)
--- a/src/lib/log/Makefile.am
+++ b/src/lib/log/Makefile.am
@@ -31,7 +31,7 @@ libb10_log_la_SOURCES += message_initializer.cc message_initializer.h
 libb10_log_la_SOURCES += message_reader.cc message_reader.h
 libb10_log_la_SOURCES += message_types.h
 libb10_log_la_SOURCES += output_option.cc output_option.h
-libb10_log_la_SOURCES += log_buffer.cc log_buffer.h
+libb10_log_la_SOURCES += log_buffer_impl.cc log_buffer_impl.h
 
 EXTRA_DIST  = README
 EXTRA_DIST += logimpl_messages.mes

diff --git a/src/lib/log/log_buffer.cc b/src/lib/log/log_buffer_impl.cc
similarity index 97%
rename from src/lib/log/log_buffer.cc
rename to src/lib/log/log_buffer_impl.cc
index 5c29d20baa4812acbe94b1df79f7afee3612c2b4..837d9f3e7a724ed507e1421a06422fd7255d8992 100644 (file)
--- a/src/lib/log/log_buffer.cc
+++ b/src/lib/log/log_buffer_impl.cc
@@ -12,14 +12,15 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include <log/log_buffer.h>
-#include <log4cplus/loglevel.h>
+#include <log/log_buffer_impl.h>
 
+#include <log4cplus/loglevel.h>
 #include <boost/scoped_ptr.hpp>
 #include <iostream>
 
 namespace isc {
 namespace log {
+namespace internal {
 
 LogBuffer& getLogBuffer() {
     static boost::scoped_ptr<LogBuffer> log_buffer(NULL);
@@ -100,5 +101,6 @@ BufferAppender::append(const log4cplus::spi::InternalLoggingEvent& event) {
     buffer_.add(event);
 }
 
+} // end namespace internal
 } // end namespace log
 } // end namespace isc

diff --git a/src/lib/log/log_buffer.h b/src/lib/log/log_buffer_impl.h
similarity index 98%
rename from src/lib/log/log_buffer.h
rename to src/lib/log/log_buffer_impl.h
index 9e41533a6316cfde6c691828db325b8680e6faae..887b210d3a07efd7265b8b5bda1d99a89d97c158 100644 (file)
--- a/src/lib/log/log_buffer.h
+++ b/src/lib/log/log_buffer_impl.h
@@ -23,6 +23,7 @@
 
 namespace isc {
 namespace log {
+namespace internal {
 
 /// \brief Buffer add after flush
 ///
@@ -126,6 +127,7 @@ private:
 /// \brief Getter for the singleton instance of the log buffer
 LogBuffer& getLogBuffer();
 
+} // end namespace internal
 } // end namespace log
 } // end namespace isc
 

diff --git a/src/lib/log/logger_manager_impl.cc b/src/lib/log/logger_manager_impl.cc
index f67116dda0d0ca68d3654c2cc0dddc0c8fd87bb1..9a7ba29f31eaed83677c010e7ba483789e6fff4a 100644 (file)
--- a/src/lib/log/logger_manager_impl.cc
+++ b/src/lib/log/logger_manager_impl.cc
@@ -30,7 +30,7 @@
 #include <log/log_messages.h>
 #include <log/logger_name.h>
 #include <log/logger_specification.h>
-#include <log/log_buffer.h>
+#include <log/log_buffer_impl.h>
 
 using namespace std;
 
@@ -51,7 +51,7 @@ LoggerManagerImpl::processInit() {
 // Flush the LogBuffer at the end of processing a new specification
 void
 LoggerManagerImpl::processEnd() {
-    getLogBuffer().flush();
+    internal::getLogBuffer().flush();
 }
 
 // Process logging specification.  Set up the common states then dispatch to
@@ -141,7 +141,8 @@ LoggerManagerImpl::createFileAppender(log4cplus::Logger& logger,
 
 void
 LoggerManagerImpl::createBufferAppender(log4cplus::Logger& logger) {
-    log4cplus::SharedAppenderPtr bufferapp(new BufferAppender(getLogBuffer()));
+    log4cplus::SharedAppenderPtr bufferapp(
+        new internal::BufferAppender(internal::getLogBuffer()));
     bufferapp->setName("buffer");
     logger.addAppender(bufferapp);
     // Since we do not know at what level the loggers will end up

diff --git a/src/lib/log/tests/log_buffer_unittest.cc b/src/lib/log/tests/log_buffer_unittest.cc
index 0d6da8f7f9ccf71d02bd6d856584457e752dca7a..4fbe75fe6802334a9322b6290f1b7d40eb5d4c2c 100644 (file)
--- a/src/lib/log/tests/log_buffer_unittest.cc
+++ b/src/lib/log/tests/log_buffer_unittest.cc
@@ -18,7 +18,7 @@
 #include <log/macros.h>
 #include <log/logger_support.h>
 #include <log/log_messages.h>
-#include <log/log_buffer.h>
+#include <log/log_buffer_impl.h>
 
 #include <log4cplus/loggingmacros.h>
 #include <log4cplus/logger.h>
@@ -26,6 +26,7 @@
 #include <log4cplus/spi/loggingevent.h>
 
 using namespace isc::log;
+using namespace isc::log::internal;
 
 namespace isc {
 namespace log {