Changeset 1854

Timestamp:

22/09/2007 00:05:25 (4 years ago)

Author:

chris

Message:

Use Daemon's delegated option processing instead of our own hacks.

Move Windows service startup, installation and removal to BackupDaemon?.

Location:

box/chris/general/bin/bbackupd

Files:

• BackupDaemon.cpp (modified) (3 diffs)
• BackupDaemon.h (modified) (2 diffs)
• bbackupd.cpp (modified) (1 diff)

box/chris/general/bin/bbackupd/BackupDaemon.cpp

@@ -77 +77 @@
 #include "autogen_ClientException.h"
 
+#ifdef WIN32
+        #include "Win32ServiceFunctions.h"
+        #include "Win32BackupService.h"
+
+        extern Win32BackupService* gpDaemonService;
+#endif
+
 #include "MemLeakFindOn.h"
 
@@ -117 +124 @@
           mDeleteUnusedRootDirEntriesAfter(0),
           mLogAllFileAccess(false)
+        #ifdef WIN32
+        , mInstallService(false),
+          mRemoveService(false),
+          mRunAsService(false)
+        #endif
 {
         // Only ever one instance of a daemon
@@ -277 +289 @@
 
 #ifdef WIN32
+std::string BackupDaemon::GetOptionString()
+{
+        std::string oldOpts = this->Daemon::GetOptionString();
+        ASSERT(oldOpts.find("s") == std::string::npos);
+        ASSERT(oldOpts.find("S") == std::string::npos);
+        ASSERT(oldOpts.find("i") == std::string::npos);
+        ASSERT(oldOpts.find("r") == std::string::npos);
+        return oldOpts + "sS:ir";
+}
+
+int BackupDaemon::ProcessOption(signed int option)
+{
+        switch(option)
+        {
+                case 's':
+                {
+                        mRunAsService = true;
+                        return 0;
+                }
+
+                case 'S':
+                {
+                        mServiceName = optarg;
+                        return 0;
+                }
+
+                case 'i':
+                {
+                        mInstallService = true;
+                        return 0;
+                }
+
+                case 'r':
+                {
+                        mRemoveService = true;
+                        return 0;
+                }
+
+                default:
+                {
+                        return this->Daemon::ProcessOption(option);
+                }
+        }
+}
+
+int BackupDaemon::Main(const std::string &rConfigFileName)
+{
+        if (mInstallService)
+        {
+                return InstallService(rConfigFileName.c_str());
+        }
+
+        if (mRemoveService)
+        {
+                return RemoveService();
+        }
+
+        int returnCode;
+
+        if (mRunAsService)
+        {
+                // We will be called reentrantly by the Service Control
+                // Manager, and we had better not call OurService again!
+                mRunAsService = false;
+
+                BOX_INFO("Box Backup service starting");
+                returnCode = OurService(rConfigFileName.c_str());
+                BOX_INFO("Box Backup service shut down");
+        }
+        else
+        {
+                returnCode = this->Daemon::Main(rConfigFileName);
+        }
+        
+        return returnCode;
+}
+
 void BackupDaemon::RunHelperThread(void)
 {

box/chris/general/bin/bbackupd/BackupDaemon.h

@@ -59 +59 @@
         bool DeleteStoreObjectInfo() const;
         BackupDaemon(const BackupDaemon &);
+
 public:
+        #ifdef WIN32
+                // add command-line options to handle Windows services
+                std::string GetOptionString();
+                int ProcessOption(signed int option);
+                int Main(const std::string &rConfigFileName);
+        #endif
 
         void Run();
@@ -417 +424 @@
         private:
         bool mDoSyncFlagOut, mSyncIsForcedOut;
+        bool mInstallService, mRemoveService, mRunAsService;
+        std::string mServiceName;
         HANDLE mhMessageToSendEvent, mhCommandReceivedEvent;
         CRITICAL_SECTION mMessageQueueLock;

box/chris/general/bin/bbackupd/bbackupd.cpp

@@ -36 +36 @@
 #ifdef WIN32
 
-        if(argc == 2 &&
-                (::strcmp(argv[1], "--help") == 0 ||
-                 ::strcmp(argv[1], "-h") == 0))
-        {
-                printf("-h help, -i install service, -r remove service,\n"
-                        "-c <config file> start daemon now");
-                return 2;
-        }
-        if(argc == 2 && ::strcmp(argv[1], "-r") == 0)
-        {
-                return RemoveService();
-        }
-        if((argc == 2 || argc == 3) && ::strcmp(argv[1], "-i") == 0)
-        {
-                const char* config = NULL;
-                if (argc == 3)
-                {
-                        config = argv[2];
-                }
-                return InstallService(config);
-        }
-
-        bool runAsWin32Service = false;
-        if (argc >= 2 && ::strcmp(argv[1], "--service") == 0)
-        {
-                runAsWin32Service = true;
-        }
+        EnableBackupRights();
 
         gpDaemonService = new Win32BackupService();
-
-        EnableBackupRights();
-
-        if (runAsWin32Service)
-        {
-                BOX_INFO("Box Backup service starting");
-
-                char* config = NULL;
-                if (argc >= 3)
-                {
-                        config = strdup(argv[2]);
-                }
-
-                ExitCode = OurService(config);
-
-                if (config)
-                {
-                        free(config);
-                }
-
-                BOX_INFO("Box Backup service shut down");
-        }
-        else
-        {
-                ExitCode = gpDaemonService->Main(
-                        BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE, argc, argv);
-        }
-
+        ExitCode = gpDaemonService->Daemon::Main(
+                BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE,
+                argc, argv);
         delete gpDaemonService;