Changeset 2177

Timestamp:

28/05/2008 14:28:16 (2 years ago)

Author:

chris

Message:

Move loading configuration into a separate method.

Add -W<level> option to set warning level explicitly.

Location:

box/trunk/lib/server

Files:

• Daemon.cpp (modified) (7 diffs)
• Daemon.h (modified) (3 diffs)

box/trunk/lib/server/Daemon.cpp

@@ -113 +113 @@
                 "DFkP"
         #endif
-                "hqvVt:TU";
+                "hqt:TUvVW:";
 }
 
@@ -138 +138 @@
         "  -v         Run more verbosely, increase verbosity level by one, can repeat\n"
         "  -V         Run at maximum verbosity\n"
+        "  -W <level> Set verbosity to error/warning/notice/info/trace/everything\n"
         "  -t <tag>   Tag console output with specified marker\n"
         "  -T         Timestamp console output\n"
@@ -235 +236 @@
                 {
                         mLogLevel = Log::EVERYTHING;
+                }
+                break;
+
+                case 'W':
+                {
+                        mLogLevel = Logging::GetNamedLevel(optarg);
+                        if (mLogLevel == Log::INVALID)
+                        {
+                                BOX_FATAL("Invalid logging level");
+                                return 2;
+                        }
                 }
                 break;
@@ -354 +366 @@
 //
 // Function
+//              Name:    Daemon::Configure(const std::string& rConfigFileName)
+//              Purpose: Loads daemon configuration. Useful when you have
+//                       a local Daemon object and don't intend to fork()
+//                       or call Main().
+//              Created: 2008/04/19
+//
+// --------------------------------------------------------------------------
+
+bool Daemon::Configure(const std::string& rConfigFileName)
+{
+        mConfigFileName = rConfigFileName;
+
+        // Load the configuration file.
+        std::string errors;
+        std::auto_ptr<Configuration> pconfig;
+
+        try
+        {
+                pconfig = Configuration::LoadAndVerify(
+                        mConfigFileName.c_str(), 
+                        GetConfigVerify(), errors);
+        }
+        catch(BoxException &e)
+        {
+                if(e.GetType() == CommonException::ExceptionType &&
+                        e.GetSubType() == CommonException::OSFileOpenError)
+                {
+                        BOX_ERROR("Failed to open configuration file: " 
+                                << mConfigFileName);
+                        return false;
+                }
+
+                throw;
+        }
+
+        // Got errors?
+        if(pconfig.get() == 0 || !errors.empty())
+        {
+                BOX_ERROR("Configuration errors: " << errors);
+                return false;
+        }
+        
+        // Store configuration
+        mpConfiguration = pconfig.release();
+        mLoadedConfigModifiedTime = GetConfigFileModifiedTime();
+        
+        // Let the derived class have a go at setting up stuff
+        // in the initial process
+        SetupInInitialProcess();
+                
+        return true;
+}
+
+// --------------------------------------------------------------------------
+//
+// Function
 //              Name:    Daemon::Main(const std::string& rConfigFileName)
 //              Purpose: Starts the daemon off -- equivalent of C main() function
@@ -368 +436 @@
         std::string pidFileName;
 
-        mConfigFileName = rConfigFileName;
-        
-        bool asDaemon   = !mSingleProcess && !mRunInForeground;
+        bool asDaemon = !mSingleProcess && !mRunInForeground;
 
         try
         {
-                // Load the configuration file.
-                std::string errors;
-                std::auto_ptr<Configuration> pconfig;
-
-                try
-                {
-                        pconfig = Configuration::LoadAndVerify(
-                                mConfigFileName.c_str(), 
-                                GetConfigVerify(), errors);
-                }
-                catch(BoxException &e)
-                {
-                        if(e.GetType() == CommonException::ExceptionType &&
-                                e.GetSubType() == CommonException::OSFileOpenError)
-                        {
-                                BOX_FATAL("Failed to start: failed to open "
-                                        "configuration file: " 
-                                        << mConfigFileName);
-                                return 1;
-                        }
-
-                        throw;
-                }
-
-                // Got errors?
-                if(pconfig.get() == 0 || !errors.empty())
-                {
-                        // Tell user about errors
-                        BOX_FATAL("Failed to start: errors in configuration "
-                                "file: " << mConfigFileName << ": " << errors);
-                        // And give up
+                if (!Configure(rConfigFileName))
+                {
+                        BOX_FATAL("Failed to start: failed to load "
+                                "configuration file: " << rConfigFileName);
                         return 1;
                 }
-                
-                // Store configuration
-                mpConfiguration = pconfig.release();
-                mLoadedConfigModifiedTime = GetConfigFileModifiedTime();
-                
-                // Let the derived class have a go at setting up stuff in the initial process
-                SetupInInitialProcess();
                 
                 // Server configuration
@@ -676 +708 @@
 #ifdef WIN32
         WSACleanup();
+#else
+        // Should clean up here, but it breaks memory leak tests.
+        /*
+        if(asDaemon)
+        {
+                // we are running in the child by now, and should not return
+                delete mpConfiguration;
+                mpConfiguration = NULL;
+                exit(0);
+        }
+        */
 #endif
-        
+
         return retcode;
 }
@@ -841 +884 @@
 // Function
 //              Name:    Daemon::SetupInInitialProcess()
-//              Purpose: A chance for the daemon to do something initial setting up in the process which
-//                               initiates everything, and after the configuration file has been read and verified.
+//              Purpose: A chance for the daemon to do something initial
+//                       setting up in the process which initiates
+//                       everything, and after the configuration file has
+//                       been read and verified.
 //              Created: 2003/08/20
 //

box/trunk/lib/server/Daemon.h

@@ -55 +55 @@
         virtual const ConfigurationVerify *GetConfigVerify() const;
         virtual void Usage();
-        
+
+        virtual bool Configure(const std::string& rConfigFileName);
+
         bool StopRun() {return mReloadConfigWanted | mTerminateWanted;}
         bool IsReloadConfigWanted() {return mReloadConfigWanted;}
@@ -64 +66 @@
         void SetTerminateWanted() {mTerminateWanted = true;}
         
-        virtual void SetupInInitialProcess();
         virtual void EnterChild();
         
@@ -70 +71 @@
 
 protected:
+        virtual void SetupInInitialProcess();
         box_time_t GetLoadedConfigModifiedTime() const;
         bool IsSingleProcess() { return mSingleProcess; }