Changeset 2081 for box/trunk/lib/common/Logging.cpp

Timestamp:

31/01/2008 23:44:54 (4 years ago)

Author:

chris

Message:

Add support for microsecond timestamps and PID logging on console log
for daemons.

File:

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

box/trunk/lib/common/Logging.cpp

@@ -183 +183 @@
 bool Console::sShowTimeMicros = false;
 bool Console::sShowTag = false;
+bool Console::sShowPID = false;
 std::string Console::sTag;
 
@@ -201 +202 @@
 }
 
+void Console::SetShowPID(bool enabled)
+{
+        sShowPID = enabled;
+}
+
 bool Console::Log(Log::Level level, const std::string& rFile, 
         int line, std::string& rMessage)
@@ -216 +222 @@
         }
 
-        std::string msg;
+        std::ostringstream buf;
 
         if (sShowTime)
@@ -232 +238 @@
                 #endif
                 {
-                        std::ostringstream buf;
-
                         buf << std::setfill('0') <<
                                 std::setw(2) << tm_ptr->tm_hour << ":" << 
@@ -245 +249 @@
 
                         buf << " ";
-                        msg += buf.str();
                 }
                 else
                 {
-                        msg += strerror(errno);
-                        msg += " ";
+                        buf << strerror(errno);
+                        buf << " ";
                 }
         }
@@ -256 +259 @@
         if (sShowTag)
         {
-                msg += "[" + sTag + "] ";
+                if (sShowPID)
+                {
+                        buf << "[" << sTag << " " << getpid() << "] ";
+                }
+                else
+                {
+                        buf << "[" << sTag << "] ";
+                }
+        }
+        else if (sShowPID)
+        {
+                buf << "[" << getpid() << "] ";
         }
 
         if (level <= Log::FATAL)
         {
-                msg += "FATAL: ";
+                buf << "FATAL:   ";
         }
         else if (level <= Log::ERROR)
         {
-                msg += "ERROR: ";
+                buf << "ERROR:   ";
         }
         else if (level <= Log::WARNING)
         {
-                msg += "WARNING: ";
+                buf << "WARNING: ";
         }
         else if (level <= Log::NOTICE)
         {
-                msg += "NOTICE: ";
-        }
-        
-        msg += rMessage;
-
-        fprintf(target, "%s\n", msg.c_str());
+                buf << "NOTICE:  ";
+        }
+        else if (level <= Log::INFO)
+        {
+                buf << "INFO:    ";
+        }
+        else if (level <= Log::TRACE)
+        {
+                buf << "TRACE:   ";
+        }
+
+        buf << rMessage;
+
+        fprintf(target, "%s\n", buf.str().c_str());
         
         return true;