Changeset 2081

Timestamp:

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

Author:

chris

Message:

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

Location:

box/trunk/lib

Files:

• common/Logging.cpp (modified) (6 diffs)
• common/Logging.h (modified) (2 diffs)
• server/Daemon.cpp (modified) (4 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;

box/trunk/lib/common/Logging.h

@@ -122 +122 @@
         static bool sShowTag;
         static std::string sTag;
+        static bool sShowPID;
 
         public:
@@ -132 +133 @@
         static void SetShowTime(bool enabled);
         static void SetShowTimeMicros(bool enabled);
+        static void SetShowPID(bool enabled);
 };
 

box/trunk/lib/server/Daemon.cpp

@@ -107 +107 @@
                 "DFk"
         #endif
-                "hqvVt:T";
+                "hPqvVt:TU";
 }
 
@@ -126 +126 @@
         "  -k         Keep console open after fork, keep writing log messages to it\n"
 #endif
+        "  -P         Show process ID (PID) in console output\n"
         "  -q         Run more quietly, reduce verbosity level by one, can repeat\n"
         "  -v         Run more verbosely, increase verbosity level by one, can repeat\n"
         "  -V         Run at maximum verbosity\n"
         "  -t <tag>   Tag console output with specified marker\n"
-        "  -T         Timestamp console output\n";
+        "  -T         Timestamp console output\n"
+        "  -U         Timestamp console output with microseconds\n";
 }
 
@@ -182 +184 @@
                 break;
 
+                case 'P':
+                {
+                        Console::SetShowPID(true);
+                }
+                break;
+
                 case 'q':
                 {
@@ -223 +231 @@
                 {
                         Console::SetShowTime(true);
+                }
+                break;
+
+                case 'U':
+                {
+                        Console::SetShowTime(true);
+                        Console::SetShowTimeMicros(true);
                 }
                 break;