Changeset 1741

Timestamp:

26/07/2007 22:35:52 (18 months ago)

Author:

chris

Message:

Add a new -F option for daemons, which runs in the foreground but still
accepts multiple connections, unlike -D or SINGLEPROCESS. (refs #3,
merges [1707])

Location:

box/chris/general/lib/server

Files:

• Daemon.cpp (modified) (4 diffs)
• Daemon.h (modified) (1 diff)

box/chris/general/lib/server/Daemon.cpp

@@ -54 +54 @@
           mTerminateWanted(false),
           mSingleProcess(false),
+          mRunInForeground(false),
           mKeepConsoleOpenAfterFork(false)
 {
@@ -122 +123 @@
         #endif
 
-        while((c = getopt(argc, (char * const *)argv, "c:DqvVt:Tk")) != -1)
+        while((c = getopt(argc, (char * const *)argv, "c:DFqvVt:Tk")) != -1)
         {
                 switch(c)
@@ -136 +137 @@
                         {
                                 mSingleProcess = true;
+                        }
+                        break;
+
+                        case 'F':
+                        {
+                                mRunInForeground = true;
                         }
                         break;
@@ -251 +258 @@
         mConfigFileName = rConfigFileName;
         
-        bool asDaemon   = !mSingleProcess;
+        bool asDaemon   = !mSingleProcess && !mRunInForeground;
 
         try

box/chris/general/lib/server/Daemon.h

@@ -80 +80 @@
         bool mTerminateWanted;
         bool mSingleProcess;
+        bool mRunInForeground;
         bool mKeepConsoleOpenAfterFork;
         static Daemon *spDaemon;