Changeset 1853

Timestamp:

22/09/2007 00:03:10 (16 months ago)

Author:

chris

Message:

Record the exit status of the daemon when running as a service, and
return it to Windows so that Windows doesn't tell the admin that
"the service did not report an error" when it stopped unexpectedly.

When failing to contact the SCM, report a textual error message as
well as the error code.

Make OurService?() take a const char * instead of char *, so that we can
pass it a std::string.c_str().

InstallService? creates service using "-s" option instead of "--service",
which no longer works once we use getopt() for option processing
(to follow).

Location:

box/chris/general/bin/bbackupd

Files:

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

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

@@ -15 +15 @@
 Win32BackupService* gpDaemonService = NULL;
 extern HANDLE gStopServiceEvent;
+extern DWORD gServiceReturnCode;
 
 unsigned int WINAPI RunService(LPVOID lpParameter)
 {
         DWORD retVal = gpDaemonService->WinService((const char*) lpParameter);
+        gServiceReturnCode = retVal;
         SetEvent(gStopServiceEvent);
         return retVal;

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

@@ -31 +31 @@
 SERVICE_STATUS_HANDLE gServiceStatusHandle = 0;
 HANDLE gStopServiceEvent = 0;
+DWORD gServiceReturnCode = 0;
 
 #define SERVICE_NAME "boxbackup"
@@ -44 +45 @@
         char buf[256];
         memset(buf, 0, sizeof(buf));
-        _snprintf(buf, sizeof(buf)-1, "%s (%d)", s, err);
+        _snprintf(buf, sizeof(buf)-1, "%s: %s", s,
+                GetErrorMessage(err).c_str());
         BOX_ERROR(buf);
         MessageBox(0, buf, "Error", 
@@ -157 +159 @@
                 gServiceStatus.dwControlsAccepted &= 
                         ~(SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN);
+
                 gServiceStatus.dwCurrentState = SERVICE_STOPPED;
+
+                if (gServiceReturnCode != 0)
+                {
+                        gServiceStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR;
+                        gServiceStatus.dwServiceSpecificExitCode = gServiceReturnCode;
+                }
+
                 SetServiceStatus(gServiceStatusHandle, &gServiceStatus);
         }
 }
 
-int OurService(char* pConfigFileName)
-{
-        spConfigFileName = pConfigFileName;
+int OurService(const char* pConfigFileName)
+{
+        spConfigFileName = strdup(pConfigFileName);
 
         SERVICE_TABLE_ENTRY serviceTable[] = 
@@ -176 +186 @@
         success = StartServiceCtrlDispatcher(serviceTable);
 
+        free(spConfigFileName);
+        spConfigFileName = NULL;
+
         if (!success)
         {
@@ -223 +236 @@
 
         std::string cmdWithArgs(cmd);
-        cmdWithArgs += " --service";
+        cmdWithArgs += " -s";
 
         if (pConfigFileName != NULL)

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

@@ -15 +15 @@
 int RemoveService  (void);
 int InstallService (const char* pConfigFilePath);
-int OurService     (char* pConfigFileName);
+int OurService     (const char* pConfigFileName);
 
 #endif