BIND 10 trac1704, updated. 43580bae76ddcbbcee3990c4156e5eabfd39cd87 [1704] Add comment for setLoggerWrapper()

[BIND 10 source code commits]

The branch, trac1704 has been updated
       via  43580bae76ddcbbcee3990c4156e5eabfd39cd87 (commit)
       via  93174a3e09334aff32c321db4fc82e6f63318727 (commit)
       via  48de64daaa4a49b706061deaf23f10310386aa1e (commit)
       via  c635812dd1e23472bcb05d361d4832b8c08faf51 (commit)
      from  5395aa1b8dfa638523a4e547dde574c91b90a4ed (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 43580bae76ddcbbcee3990c4156e5eabfd39cd87
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue May 22 10:01:36 2012 +0530

    [1704] Add comment for setLoggerWrapper()

commit 93174a3e09334aff32c321db4fc82e6f63318727
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue May 22 09:55:26 2012 +0530

    [1704] Make check on the read data more stricter

commit 48de64daaa4a49b706061deaf23f10310386aa1e
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue May 22 09:54:06 2012 +0530

    [1704] Initialize locked to 0 in case nothing is read

commit c635812dd1e23472bcb05d361d4832b8c08faf51
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue May 22 09:53:10 2012 +0530

    [1704] Move comment

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

Summary of changes:
 src/lib/log/logger_impl.h            |    4 ++++
 src/lib/log/tests/logger_unittest.cc |   14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/log/logger_impl.h b/src/lib/log/logger_impl.h
index d92f1cb..3e2a726 100644
--- a/src/lib/log/logger_impl.h
+++ b/src/lib/log/logger_impl.h
@@ -222,6 +222,10 @@ public:
         return (name_ == other.name_);
     }
 
+    /// \brief Sets a different logger wrapper
+    ///
+    /// This method is only supposed to be used by test code. It is used
+    /// to pass mock objects for intercepting log calls.
     void setLoggerWrapper(LoggerWrapper *wrapper) {
         delete logger_;
         logger_ = wrapper;
diff --git a/src/lib/log/tests/logger_unittest.cc b/src/lib/log/tests/logger_unittest.cc
index 8e8e746..fae8d9b 100644
--- a/src/lib/log/tests/logger_unittest.cc
+++ b/src/lib/log/tests/logger_unittest.cc
@@ -385,9 +385,6 @@ TEST_F(LoggerTest, LoggerNameLength) {
 #endif
 }
 
-// Checks that the logger logs exclusively and other BIND 10 components
-// are locked out.
-
 class MockWrapper : public LoggerWrapper {
 public:
     MockWrapper(const std::string& name) : LoggerWrapper(name), was_locked_(false) {
@@ -441,16 +438,16 @@ public:
             close(fds[1]);
             exit(0);
         } else {
-            unsigned char locked;
+            unsigned char locked = 0;
             // Parent reads from pipe
             close(fds[1]);
 
             // Read status and set flag
             read(fds[0], &locked, sizeof locked);
-            if (locked == 0) {
-                was_locked_ = false;
-            } else {
+            if (locked == 1) {
                 was_locked_ = true;
+            } else {
+                was_locked_ = false;
             }
 
             close(fds[0]);
@@ -465,6 +462,9 @@ private:
     bool was_locked_;
 };
 
+// Checks that the logger logs exclusively and other BIND 10 components
+// are locked out.
+
 TEST_F(LoggerTest, Lock) {
     // Create a logger
     Logger logger("alpha");