Changeset 2211

Timestamp:

03/08/2008 08:02:04 (5 months ago)

Author:

chris

Message:

Enable logging of PID on Windows.

Enable both -k and -K options on all platforms.

Files:

• box/trunk/lib/server/Daemon.cpp (modified) (8 diffs)

box/trunk/lib/server/Daemon.cpp

@@ -108 +108 @@
 {
         return "c:"
-        #ifdef WIN32
-                "K"
-        #else // !WIN32
-                "DFkP"
+        #ifndef WIN32
+                "DFP"
         #endif
-                "hqt:TUvVW:";
+                "hkKqt:TUvVW:";
 }
 
@@ -127 +125 @@
         "             argument is the configuration file, or else the default \n"
         "             [" << GetConfigFileName() << "]\n"
-#ifdef WIN32
-        "  -K         Stop writing log messages to console while daemon is running\n"
-#else // !WIN32
+#ifndef WIN32
         "  -D         Debugging mode, do not fork, one process only, one client only\n"
         "  -F         Do not fork into background, but fork to serve multiple clients\n"
+#endif
         "  -k         Keep console open after fork, keep writing log messages to it\n"
+        "  -K         Stop writing log messages to console while daemon is running\n"
+#ifndef WIN32
         "  -P         Show process ID (PID) in console output\n"
 #endif
@@ -166 +165 @@
                 break;
 
-#ifdef WIN32
+#ifndef WIN32
+                case 'D':
+                {
+                        mSingleProcess = true;
+                }
+                break;
+
+                case 'F':
+                {
+                        mRunInForeground = true;
+                }
+                break;
+#endif // !WIN32
+
+                case 'k':
+                {
+                        mKeepConsoleOpenAfterFork = true;
+                }
+                break;
+
                 case 'K':
                 {
@@ -172 +190 @@
                 }
                 break;
-#else // !WIN32
-                case 'D':
-                {
-                        mSingleProcess = true;
-                }
-                break;
-
-                case 'F':
-                {
-                        mRunInForeground = true;
-                }
-                break;
-
-                case 'k':
-                {
-                        mKeepConsoleOpenAfterFork = true;
-                }
-                break;
-#endif
 
                 case 'h':
@@ -199 +198 @@
                 break;
 
-                #ifndef WIN32
                 case 'P':
                 {
@@ -205 +203 @@
                 }
                 break;
-                #endif
 
                 case 'q':
@@ -436 +433 @@
         std::string pidFileName;
 
-        bool asDaemon = !mSingleProcess && !mRunInForeground;
+        #ifndef WIN32
+                bool asDaemon = !mSingleProcess && !mRunInForeground;
+        #endif
 
         try
@@ -542 +541 @@
                 char pid[32];
 
-#ifdef WIN32
-                int pidsize = sprintf(pid, "%d", (int)GetCurrentProcessId());
-#else
                 int pidsize = sprintf(pid, "%d", (int)getpid());
-#endif
 
                 if(::write(pidFile, pid, pidsize) != pidsize)