[1704] Move code to different places (no functional changes)

diff --git a/src/lib/log/logger.cc b/src/lib/log/logger.cc
index 7f434d4a47a51d8c9bac6072040a51aba395bc04..fef5627c8a844ed49ec457c4bc271e6fb5ee4b73 100644 (file)
--- a/src/lib/log/logger.cc
+++ b/src/lib/log/logger.cc
@@ -73,13 +73,6 @@ Logger::getEffectiveSeverity() {
     return (getLoggerPtr()->getEffectiveSeverity());
 }
 
-// Replace the interprocess synchronization object
-
-void
-Logger::setInterprocessSync(isc::util::InterprocessSync* sync) {
-    getLoggerPtr()->setInterprocessSync(sync);
-}
-
 // Debug level (only relevant if messages of severity DEBUG are being logged).
 
 int
@@ -186,6 +179,13 @@ Logger::fatal(const isc::log::MessageID& ident) {
     }
 }
 
+// Replace the interprocess synchronization object
+
+void
+Logger::setInterprocessSync(isc::util::InterprocessSync* sync) {
+    getLoggerPtr()->setInterprocessSync(sync);
+}
+
 // Comparison (testing only)
 
 bool

diff --git a/src/lib/log/logger.h b/src/lib/log/logger.h
index e579f876d8dce5fe41c9826ad31e81d120d53f31..d4a8b22fc5d13a81ae3e2936d6c37836c4da4831 100644 (file)
--- a/src/lib/log/logger.h
+++ b/src/lib/log/logger.h
@@ -179,12 +179,6 @@ public:
     /// is the severity of the parent.
     virtual isc::log::Severity getEffectiveSeverity();
 
-    /// \brief Replace the interprocess synchronization object
-    ///
-    /// \param sync The logger uses this synchronization object for
-    /// synchronizing output of log messages.
-    void setInterprocessSync(isc::util::InterprocessSync* sync);
-
     /// \brief Return DEBUG Level
     ///
     /// \return Current setting of debug level.  This is returned regardless of
@@ -244,6 +238,12 @@ public:
     /// \param ident Message identification.
     Formatter fatal(const MessageID& ident);
 
+    /// \brief Replace the interprocess synchronization object
+    ///
+    /// \param sync The logger uses this synchronization object for
+    /// synchronizing output of log messages.
+    void setInterprocessSync(isc::util::InterprocessSync* sync);
+
     /// \brief Equality
     ///
     /// Check if two instances of this logger refer to the same stream.

diff --git a/src/lib/log/logger_impl.cc b/src/lib/log/logger_impl.cc
index 16b4d52ca884970ab20acc112d055c369fbb0217..6814b554330d38416def58319c969f2fe32aa9cb 100644 (file)
--- a/src/lib/log/logger_impl.cc
+++ b/src/lib/log/logger_impl.cc
@@ -76,14 +76,6 @@ LoggerImpl::getSeverity() {
     return level.severity;
 }
 
-// Replace the interprocess synchronization object
-
-void
-LoggerImpl::setInterprocessSync(isc::util::InterprocessSync* sync) {
-    delete sync_;
-    sync_ = sync;
-}
-
 // Return current debug level (only valid if current severity level is DEBUG).
 int
 LoggerImpl::getDebugLevel() {
@@ -115,6 +107,14 @@ LoggerImpl::lookupMessage(const MessageID& ident) {
                        MessageDictionary::globalDictionary().getText(ident)));
 }
 
+// Replace the interprocess synchronization object
+
+void
+LoggerImpl::setInterprocessSync(isc::util::InterprocessSync* sync) {
+    delete sync_;
+    sync_ = sync;
+}
+
 void
 LoggerImpl::outputRaw(const Severity& severity, const string& message) {
     // Use an interprocess sync locker for mutual exclusion from other

diff --git a/src/lib/log/logger_impl.h b/src/lib/log/logger_impl.h
index e7f02af45d8fcca0216633e9b1963c63d8398cd7..0f357b41998dd90cfd374e0eed731380b0820e1f 100644 (file)
--- a/src/lib/log/logger_impl.h
+++ b/src/lib/log/logger_impl.h
@@ -110,12 +110,6 @@ public:
     virtual Severity getEffectiveSeverity();
 
 
-    /// \brief Replace the interprocess synchronization object
-    ///
-    /// \param sync The logger uses this synchronization object for
-    /// synchronizing output of log messages.
-    void setInterprocessSync(isc::util::InterprocessSync* sync);
-
     /// \brief Return debug level
     ///
     /// \return Current setting of debug level.  This will be zero if the
@@ -175,6 +169,12 @@ public:
     /// This gets you the unformatted text of message for given ID.
     std::string* lookupMessage(const MessageID& id);
 
+    /// \brief Replace the interprocess synchronization object
+    ///
+    /// \param sync The logger uses this synchronization object for
+    /// synchronizing output of log messages.
+    void setInterprocessSync(isc::util::InterprocessSync* sync);
+
     /// \brief Equality
     ///
     /// Check if two instances of this logger refer to the same stream.