Changeset 1856

Timestamp:

23/09/2007 10:18:20 (4 years ago)

Author:

chris

Message:

Use the specified service name when installing and removing the service.

Pass the service name on the service command line, and use it for event
log messages.

Location:

box/chris/general/bin/bbackupd

Files:

• BackupDaemon.cpp (modified) (2 diffs)
• Win32ServiceFunctions.cpp (modified) (5 diffs)
• Win32ServiceFunctions.h (modified) (1 diff)

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

@@ -129 +129 @@
         , mInstallService(false),
           mRemoveService(false),
-          mRunAsService(false)
+          mRunAsService(false),
+          mServiceName("bbackupd")
         #endif
 {
@@ -348 +349 @@
         if (mInstallService)
         {
-                return InstallService(rConfigFileName.c_str());
+                return InstallService(rConfigFileName.c_str(), mServiceName);
         }
 
         if (mRemoveService)
         {
-                return RemoveService();
-        }
+                return RemoveService(mServiceName);
+        }
+
+        Logging::SetProgramName("Box Backup (" + mServiceName + ")");
 
         int returnCode;

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

@@ -200 +200 @@
 }
 
-int InstallService(const char* pConfigFileName)
+int InstallService(const char* pConfigFileName, const std::string& rServiceName)
 {
         if (pConfigFileName != NULL)
@@ -236 +236 @@
 
         std::string cmdWithArgs(cmd);
-        cmdWithArgs += " -s";
+        cmdWithArgs += " -s -S \"" + rServiceName + "\"";
 
         if (pConfigFileName != NULL)
@@ -245 +245 @@
         }
 
+        std::string serviceDesc = "Box Backup (" + rServiceName + ")";
+
         SC_HANDLE newService = CreateService(
                 scm, 
-                SERVICE_NAME, 
-                "Box Backup", 
+                rServiceName.c_str(),
+                serviceDesc.c_str(),
                 SERVICE_ALL_ACCESS, 
                 SERVICE_WIN32_OWN_PROCESS, 
@@ -313 +315 @@
 }
 
-int RemoveService(void)
+int RemoveService(const std::string& rServiceName)
 {
         SC_HANDLE scm = OpenSCManager(0,0,SC_MANAGER_CREATE_SERVICE);
@@ -324 +326 @@
         }
 
-        SC_HANDLE service = OpenService(scm, SERVICE_NAME, 
+        SC_HANDLE service = OpenService(scm, rServiceName.c_str(), 
                 SERVICE_ALL_ACCESS|DELETE);
         DWORD err = GetLastError();

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

@@ -13 +13 @@
 #define WIN32SERVICEFUNCTIONS_H
 
-int RemoveService  (void);
-int InstallService (const char* pConfigFilePath);
+int RemoveService  (const std::string& rServiceName);
+int InstallService (const char* pConfigFilePath, const std::string& rServiceName);
 int OurService     (const char* pConfigFileName);