Changeset 1790 for box/chris/general/lib/common/Logging.cpp

Timestamp:

03/08/2007 00:29:31 (5 years ago)

Author:

chris

Message:

Convert most printf() and fprintf() calls to use logging framework
instead. (merges [1789])

File:

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

box/chris/general/lib/common/Logging.cpp

@@ -244 +244 @@
                 msg += "[" + sTag + "] ";
         }
+
+        if (level <= Log::FATAL)
+        {
+                msg += "FATAL: ";
+        }
+        else if (level <= Log::ERROR)
+        {
+                msg += "ERROR: ";
+        }
+        else if (level <= Log::WARNING)
+        {
+                msg += "WARNING: ";
+        }
+        else if (level <= Log::NOTICE)
+        {
+                msg += "NOTICE: ";
+        }
         
         msg += rMessage;
@@ -273 +290 @@
                 case Log::EVERYTHING: syslogLevel = LOG_DEBUG;   break;
         }
-                
-        syslog(syslogLevel, "%s", rMessage.c_str());
+
+        std::string msg;
+
+        if (level <= Log::FATAL)
+        {
+                msg = "FATAL: ";
+        }
+        else if (level <= Log::ERROR)
+        {
+                msg = "ERROR: ";
+        }
+        else if (level <= Log::WARNING)
+        {
+                msg = "WARNING: ";
+        }
+        else if (level <= Log::NOTICE)
+        {
+                msg = "NOTICE: ";
+        }
+
+        msg += rMessage;
+
+        syslog(syslogLevel, "%s", msg.c_str());
         
         return true;