Changeset 3021 for box/trunk/lib

Timestamp:

11/10/2011 23:11:54 (8 months ago)

Author:

chris

Message:

Fix illegal use of Logging::Add and Logging::Remove while iterating over loggers

File:

• box/trunk/lib/common/Logging.cpp (modified) (2 diffs)

box/trunk/lib/common/Logging.cpp

@@ -470 +470 @@
         
         /* avoid infinite loop if this throws an exception */
-        Logging::Remove(this);
+        Log::Level oldLevel = GetLevel();
+        Filter(Log::NOTHING);
 
         std::ostringstream buf;
@@ -510 +511 @@
         mLogFile.Write(output.c_str(), output.length());
 
-        Logging::Add(this);
+        // no infinite loop, reset to saved logging level
+        Filter(oldLevel);
         return true;
 }