Thread safety.

[nssm.git] / service.cpp

diff --git a/service.cpp b/service.cpp
index 395e76e..a400ebd 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -194,18 +194,7 @@ void WINAPI service_main(unsigned long argc, char **argv) {
   /* Register control handler */\r
   service_handle = RegisterServiceCtrlHandlerEx(NSSM, service_control_handler, 0);\r
   if (! service_handle) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_REGISTERSERVICECTRLHANDER_FAILED, GetLastError(), 0);\r
-    return;\r
-  }\r
-\r
-  /* Get startup parameters */\r
-  int ret = get_parameters(argv[0], exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir));\r
-  if (ret) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_PARAMETERS_FAILED, argv[0], 0);\r
-    service_status.dwCurrentState = SERVICE_STOPPED;\r
-    /* An accurate, if not particularly helpful, status */\r
-    service_status.dwWin32ExitCode = ERROR_SERVICE_NOT_ACTIVE;\r
-    SetServiceStatus(service_handle, &service_status);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_REGISTERSERVICECTRLHANDER_FAILED, error_string(GetLastError()), 0);\r
     return;\r
   }\r
 \r
@@ -254,7 +243,7 @@ int monitor_service() {
 \r
   /* Monitor service service */\r
   if (! RegisterWaitForSingleObject(&wait_handle, process_handle, end_service, (void *) pid, INFINITE, WT_EXECUTEONLYONCE | WT_EXECUTELONGFUNCTION)) {\r
-    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_REGISTERWAITFORSINGLEOBJECT_FAILED, service_name, exe, GetLastError(), 0);\r
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_REGISTERWAITFORSINGLEOBJECT_FAILED, service_name, exe, error_string(GetLastError()), 0);\r
   }\r
 \r
   return 0;\r
@@ -304,6 +293,13 @@ int start_service() {
   PROCESS_INFORMATION pi;\r
   ZeroMemory(&pi, sizeof(pi));\r
 \r
+  /* Get startup parameters */\r
+  int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir));\r
+  if (ret) {\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_PARAMETERS_FAILED, service_name, 0);\r
+    return stop_service(2, true, true);\r
+  }\r
+\r
   /* Launch executable with arguments */\r
   char cmd[CMD_LENGTH];\r
   if (_snprintf(cmd, sizeof(cmd), "%s %s", exe, flags) < 0) {\r
@@ -314,7 +310,7 @@ int start_service() {
   throttle_restart();\r
 \r
   if (! CreateProcess(0, cmd, 0, 0, false, 0, 0, dir, &si, &pi)) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service_name, exe, GetLastError(), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service_name, exe, error_string(GetLastError()), 0);\r
     return stop_service(3, true, true);\r
   }\r
   process_handle = pi.hProcess;\r