Changeset 353 for box/trunk/lib/server/Daemon.cpp

Timestamp:

30/01/2006 20:04:53 (6 years ago)

Author:

ben

Message:

Merge chris/bb-save-state, resolving conflicts

File:

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

box/trunk/lib/server/Daemon.cpp

@@ -10 +10 @@
 #include "Box.h"
 
+#include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -16 +17 @@
 #include <stdarg.h>
 
-#ifndef WIN32
-#include <syslog.h>
+#ifdef HAVE_SYSLOG_H
+        #include <syslog.h>
 #endif
 
@@ -25 +26 @@
 #include "Guards.h"
 #include "UnixUser.h"
+#include "FileModificationTime.h"
 
 #include "MemLeakFindOn.h"
@@ -93 +95 @@
 
         std::string pidFileName;
-        const char *configfile = 0;
 
         try
         {
                 // Find filename of config file
-                configfile = DefaultConfigFile;
+                mConfigFileName = DefaultConfigFile;
                 if(argc >= 2)
                 {
@@ -104 +105 @@
                         if(::strcmp(argv[1], "-c") == 0 && argc >= 3)
                         {
-                                configfile = argv[2];
+                                mConfigFileName = argv[2];
                         }
                         else
                         {
-                                configfile = argv[1];
+                                mConfigFileName = argv[1];
                         }
                 }
@@ -124 +125 @@
                 // Load the configuration file.
                 std::string errors;
-                std::auto_ptr<Configuration> pconfig = Configuration::LoadAndVerify(configfile, GetConfigVerify(), errors);
+                std::auto_ptr<Configuration> pconfig = 
+                        Configuration::LoadAndVerify(
+                                mConfigFileName.c_str(), 
+                                GetConfigVerify(), errors);
 
                 // Got errors?
@@ -130 +134 @@
                 {
                         // Tell user about errors
-                        fprintf(stderr, "%s: Errors in config file %s:\n%s", DaemonName(), configfile, errors.c_str());
+                        fprintf(stderr, "%s: Errors in config file %s:\n%s", 
+                                DaemonName(), mConfigFileName.c_str(), 
+                                errors.c_str());
                         // And give up
                         return 1;
@@ -137 +143 @@
                 // Store configuration
                 mpConfiguration = pconfig.release();
+                mLoadedConfigModifiedTime = GetConfigFileModifiedTime();
                 
                 // Server configuration
@@ -229 +236 @@
                 ::openlog(DaemonName(), LOG_PID, LOG_LOCAL6);
                 // Log the start message
-                ::syslog(LOG_INFO, "Starting daemon (config: %s) (version " BOX_VERSION ")", configfile);
+                ::syslog(LOG_INFO, "Starting daemon (config: %s) (version " 
+                        BOX_VERSION ")", mConfigFileName.c_str());
 
 #ifndef WIN32
@@ -307 +315 @@
                         {
                                 // Need to reload that config file...
-                                ::syslog(LOG_INFO, "Reloading configuration (config: %s)", configfile);
+                                ::syslog(LOG_INFO, "Reloading configuration "
+                                        "(config: %s)", 
+                                        mConfigFileName.c_str());
                                 std::string errors;
-                                std::auto_ptr<Configuration> pconfig = Configuration::LoadAndVerify(configfile, GetConfigVerify(), errors);
+                                std::auto_ptr<Configuration> pconfig = 
+                                        Configuration::LoadAndVerify(
+                                                mConfigFileName.c_str(),
+                                                GetConfigVerify(), errors);
 
                                 // Got errors?
@@ -315 +328 @@
                                 {
                                         // Tell user about errors
-                                        ::syslog(LOG_ERR, "Errors in config file %s:\n%s", configfile, errors.c_str());
+                                        ::syslog(LOG_ERR, "Errors in config "
+                                                "file %s:\n%s", 
+                                                mConfigFileName.c_str(),
+                                                errors.c_str());
                                         // And give up
                                         return 1;
@@ -326 +342 @@
                                 // Store configuration
                                 mpConfiguration = pconfig.release();
+                                mLoadedConfigModifiedTime =
+                                        GetConfigFileModifiedTime();
                                 
                                 // Stop being marked for loading config again
@@ -548 +566 @@
 #endif // HAVE_SETPROCTITLE
 }
+
+
+// --------------------------------------------------------------------------
+//
+// Function
+//              Name:    Daemon::GetConfigFileModifiedTime()
+//              Purpose: Returns the timestamp when the configuration file
+//                       was last modified
+//
+//              Created: 2006/01/29
+//
+// --------------------------------------------------------------------------
+
+box_time_t Daemon::GetConfigFileModifiedTime() const
+{
+        struct stat st;
+
+        if(::stat(GetConfigFileName().c_str(), &st) != 0)
+        {
+                if (errno == ENOENT)
+                {
+                        return 0;
+                }
+                THROW_EXCEPTION(CommonException, OSFileError)
+        }
+        
+        return FileModificationTime(st);
+}
+
+// --------------------------------------------------------------------------
+//
+// Function
+//              Name:    Daemon::GetLoadedConfigModifiedTime()
+//              Purpose: Returns the timestamp when the configuration file
+//                       had been last modified, at the time when it was 
+//                       loaded
+//
+//              Created: 2006/01/29
+//
+// --------------------------------------------------------------------------
+
+box_time_t Daemon::GetLoadedConfigModifiedTime() const
+{
+        return mLoadedConfigModifiedTime;
+}
+