[Box Backup-commit] COMMIT r1888 - box/trunk/lib/server

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-10-17 13:53:07 +0100 (Wed, 17 Oct 2007)
New Revision: 1888

Modified:
   box/trunk/lib/server/Daemon.h
Log:
Make Main(), GetOptionString() and ProcessOption virtual so that they
can actually be overridden. (merges [1852])


Modified: box/trunk/lib/server/Daemon.h
===================================================================
--- box/trunk/lib/server/Daemon.h	2007-10-17 12:52:47 UTC (rev 1887)
+++ box/trunk/lib/server/Daemon.h	2007-10-17 12:53:07 UTC (rev 1888)
@@ -41,7 +41,9 @@
 public:
 
 	int Main(const char *DefaultConfigFile, int argc, const char *argv[]);
-	int Main(const std::string &rConfigFile);
+
+	/* override this Main() if you want custom option processing: */
+	virtual int Main(const std::string &rConfigFile);
 	
 	virtual void Run();
 	const Configuration &GetConfiguration() const;
@@ -67,8 +69,8 @@
 protected:
 	box_time_t GetLoadedConfigModifiedTime() const;
 	bool IsSingleProcess() { return mSingleProcess; }
-	std::string GetOptionString();
-	int ProcessOption(signed int option);
+	virtual std::string GetOptionString();
+	virtual int ProcessOption(signed int option);
 	
 private:
 	static void SignalHandler(int sigraised);