Changeset 2092

Timestamp:

22/02/2008 00:43:16 (11 months ago)

Author:

chris

Message:

Disable -P option and showing PID in Logging on Windows.

Location:

box/trunk/lib

Files:

• common/Logging.cpp (modified) (4 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;
+#ifndef WIN32
 bool Console::sShowPID = false;
+#endif
 std::string Console::sTag;
 
@@ -202 +204 @@
 }
 
+#ifndef WIN32
 void Console::SetShowPID(bool enabled)
 {
         sShowPID = enabled;
 }
+#endif
 
 bool Console::Log(Log::Level level, const std::string& rFile, 
@@ -259 +263 @@
         if (sShowTag)
         {
+                #ifndef WIN32
                 if (sShowPID)
                 {
@@ -264 +269 @@
                 }
                 else
+                #endif
                 {
                         buf << "[" << sTag << "] ";
                 }
         }
+        #ifndef WIN32
         else if (sShowPID)
         {
                 buf << "[" << getpid() << "] ";
         }
+        #endif
 
         if (level <= Log::FATAL)

box/trunk/lib/common/Logging.h

@@ -122 +122 @@
         static bool sShowTag;
         static std::string sTag;
+        #ifndef WIN32
         static bool sShowPID;
+        #endif
 
         public:
@@ -133 +135 @@
         static void SetShowTime(bool enabled);
         static void SetShowTimeMicros(bool enabled);
+        #ifndef WIN32
         static void SetShowPID(bool enabled);
+        #endif
 };
 

box/trunk/lib/server/Daemon.cpp

@@ -105 +105 @@
         return "c:"
         #ifndef WIN32
-                "DFk"
+                "DFkP"
         #endif
-                "hPqvVt:TU";
+                "hqvVt:TU";
 }
 
@@ -125 +125 @@
         "  -F         Do not fork into background, but fork to serve multiple clients\n"
         "  -k         Keep console open after fork, keep writing log messages to it\n"
+        "  -P         Show process ID (PID) in console output\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"
@@ -184 +184 @@
                 break;
 
+                #ifndef WIN32
                 case 'P':
                 {
@@ -189 +190 @@
                 }
                 break;
+                #endif
 
                 case 'q':