NSSM 2.12.

[nssm.git] / service.cpp

diff --git a/service.cpp b/service.cpp
index 4f7ff03..ef4ef51 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -96,13 +96,12 @@ int install_service(char *name, char *exe, char *flags) {
 \r
   /* Construct command */\r
   char command[CMD_LENGTH];\r
-  size_t runlen = strlen(NSSM_RUN);\r
   size_t pathlen = strlen(path);\r
-  if (pathlen + runlen + 2 >= VALUE_LENGTH) {\r
+  if (pathlen + 1 >= VALUE_LENGTH) {\r
     fprintf(stderr, "The full path to " NSSM " is too long!\n");\r
     return 3;\r
   }\r
-  if (_snprintf(command, sizeof(command), "\"%s\" %s", path, NSSM_RUN) < 0) {\r
+  if (_snprintf(command, sizeof(command), "\"%s\"", path) < 0) {\r
     fprintf(stderr, "Out of memory for ImagePath!\n");\r
     return 4;\r
   }\r
@@ -210,6 +209,9 @@ void WINAPI service_main(unsigned long argc, char **argv) {
 \r
   /* Used for signalling a resume if the service pauses when throttled. */\r
   throttle_timer = CreateWaitableTimer(0, 1, 0);\r
+  if (! throttle_timer) {\r
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_CREATEWAITABLETIMER_FAILED, service_name, error_string(GetLastError()), 0);\r
+  }\r
 \r
   monitor_service();\r
 }\r
@@ -259,6 +261,7 @@ unsigned long WINAPI service_control_handler(unsigned long control, unsigned lon
       return NO_ERROR;\r
 \r
     case SERVICE_CONTROL_CONTINUE:\r
+      if (! throttle_timer) return ERROR_CALL_NOT_IMPLEMENTED;\r
       throttle = 0;\r
       ZeroMemory(&throttle_duetime, sizeof(throttle_duetime));\r
       SetWaitableTimer(throttle_timer, &throttle_duetime, 0, 0, 0, 0);\r
@@ -296,7 +299,8 @@ int start_service() {
   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), &throttle_delay);\r
+  char *env = 0;\r
+  int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir), &env, &throttle_delay);\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
@@ -304,15 +308,17 @@ int start_service() {
 \r
   /* Launch executable with arguments */\r
   char cmd[CMD_LENGTH];\r
-  if (_snprintf(cmd, sizeof(cmd), "%s %s", exe, flags) < 0) {\r
+  if (_snprintf(cmd, sizeof(cmd), "\"%s\" %s", exe, flags) < 0) {\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "command line", "start_service", 0);\r
     return stop_service(2, true, true);\r
   }\r
 \r
   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, error_string(GetLastError()), 0);\r
+  if (! CreateProcess(0, cmd, 0, 0, false, 0, env, dir, &si, &pi)) {\r
+    unsigned long error = GetLastError();\r
+    if (error == ERROR_INVALID_PARAMETER && env) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED_INVALID_ENVIRONMENT, service_name, exe, NSSM_REG_ENV, 0);\r
+    else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service_name, exe, error_string(error), 0);\r
     return stop_service(3, true, true);\r
   }\r
   process_handle = pi.hProcess;\r
@@ -455,12 +461,15 @@ void throttle_restart() {
   _snprintf(milliseconds, sizeof(milliseconds), "%d", ms);\r
   log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_THROTTLED, service_name, threshold, milliseconds, 0);\r
 \r
-  ZeroMemory(&throttle_duetime, sizeof(throttle_duetime));\r
-  throttle_duetime.QuadPart = 0 - (ms * 10000);\r
-  SetWaitableTimer(throttle_timer, &throttle_duetime, 0, 0, 0, 0);\r
+  if (throttle_timer) {\r
+    ZeroMemory(&throttle_duetime, sizeof(throttle_duetime));\r
+    throttle_duetime.QuadPart = 0 - (ms * 10000LL);\r
+    SetWaitableTimer(throttle_timer, &throttle_duetime, 0, 0, 0, 0);\r
+  }\r
 \r
   service_status.dwCurrentState = SERVICE_PAUSED;\r
   SetServiceStatus(service_handle, &service_status);\r
 \r
-  WaitForSingleObject(throttle_timer, INFINITE);\r
+  if (throttle_timer) WaitForSingleObject(throttle_timer, INFINITE);\r
+  else Sleep(ms);\r
 }\r