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

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.h (modified) (3 diffs)

box/trunk/lib/server/Daemon.h

@@ -16 +16 @@
 #ifndef DAEMON__H
 #define DAEMON__H
+
+#include <string>
+
+#include "BoxTime.h"
 
 class Configuration;
@@ -41 +45 @@
         virtual void Run();
         const Configuration &GetConfiguration() const;
-        
+        const std::string &GetConfigFileName() const {return mConfigFileName;}
+
         virtual const char *DaemonName() const;
         virtual const char *DaemonBanner() const;
@@ -58 +63 @@
         
         static void SetProcessTitle(const char *format, ...);
+
+protected:
+        box_time_t GetLoadedConfigModifiedTime() const;
         
 private:
         static void SignalHandler(int sigraised);
+        box_time_t GetConfigFileModifiedTime() const;
         
 private:
+        std::string mConfigFileName;
         Configuration *mpConfiguration;
+        box_time_t mLoadedConfigModifiedTime;
         bool mReloadConfigWanted;
         bool mTerminateWanted;