Changeset 3059

Timestamp:

22/01/2012 16:17:36 (4 months ago)

Author:

chris

Message:

Split option processing out of Daemon::Main() to ease use of Daemon class in tests.

Location:

box/trunk/lib/server

Files:

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

box/trunk/lib/server/Daemon.cpp

@@ -330 +330 @@
         mAppName = argv[0];
 
+        int ret = ProcessOptions(argc, argv);
+        if (ret != 0)
+        {
+                return ret;
+        }
+
+        return Main(mConfigFileName);
+}
+
+// --------------------------------------------------------------------------
+//
+// Function
+//              Name:    Daemon::ProcessOptions(int argc, const char *argv[])
+//              Purpose: Parses command-line options. Useful when you have
+//                       a local Daemon object and don't intend to fork()
+//                       or call Main().
+//              Created: 2008/11/04
+//
+// --------------------------------------------------------------------------
+
+int Daemon::ProcessOptions(int argc, const char *argv[])
+{
         #ifdef BOX_RELEASE_BUILD
-        mLogLevel = Log::NOTICE; // need an int to do math with
+        mLogLevel = Log::NOTICE;
         #else
-        mLogLevel = Log::INFO; // need an int to do math with
+        mLogLevel = Log::INFO;
         #endif
 
@@ -394 +416 @@
         }
 
-        return Main(mConfigFileName);
+        return 0;
 }
 

box/trunk/lib/server/Daemon.h

@@ -43 +43 @@
         virtual int Main(const std::string& rDefaultConfigFile, int argc,
                 const char *argv[]);
+        virtual int ProcessOptions(int argc, const char *argv[]);
 
         /* override this Main() if you want custom option processing: */