Changeset 2110

Timestamp:

13/03/2008 21:48:05 (10 months ago)

Author:

chris

Message:

Add the -K option to Daemons on Windows to keep them quiet even though
they don't fork by themselves. This is because the tests are able to run
them in the background, and if they keep the console open then they will
continue to spew to it. This option is normally only useful when running
the daemon in a test.

Files:

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

box/trunk/lib/server/Daemon.cpp

@@ -53 +53 @@
           mSingleProcess(false),
           mRunInForeground(false),
+        #ifdef WIN32
+          mKeepConsoleOpenAfterFork(true),
+        #else
           mKeepConsoleOpenAfterFork(false),
+        #endif
           mHaveConfigFile(false),
           mAppName(DaemonName())
@@ -104 +108 @@
 {
         return "c:"
-        #ifndef WIN32
+        #ifdef WIN32
+                "K"
+        #else // !WIN32
                 "DFkP"
         #endif
@@ -121 +127 @@
         "             argument is the configuration file, or else the default \n"
         "             [" << GetConfigFileName() << "]\n"
-#ifndef WIN32
+#ifdef WIN32
+        "  -K         Stop writing log messages to console while daemon is running\n"
+#else // !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"
@@ -157 +165 @@
                 break;
 
-#ifndef WIN32
+#ifdef WIN32
+                case 'K':
+                {
+                        mKeepConsoleOpenAfterFork = false;
+                }
+                break;
+#else // !WIN32
                 case 'D':
                 {
@@ -491 +505 @@
 #endif // !WIN32
 
-                // Log the start message
-                BOX_NOTICE("Starting daemon, version " << BOX_VERSION
-                        << ", config: " << mConfigFileName);
-
                 // Write PID to file
                 char pid[32];
@@ -519 +529 @@
                 #endif // BOX_MEMORY_LEAK_TESTING
         
-                if(asDaemon && !mKeepConsoleOpenAfterFork)
+                if(
+                        #ifndef WIN32
+                                asDaemon && 
+                        #endif
+                        !mKeepConsoleOpenAfterFork)
                 {
 #ifndef WIN32
@@ -546 +560 @@
                         // -- this has in the past sent text to something which isn't expecting it.
                         TRACE_TO_STDOUT(false);
+#endif // ! WIN32
                         Logging::ToConsole(false);
-#endif // ! WIN32
                 }               
+
+                // Log the start message
+                BOX_NOTICE("Starting daemon, version: " << BOX_VERSION);
+                BOX_NOTICE("Using configuration file: " << mConfigFileName);
         }
         catch(BoxException &e)