Enforce maximum report delay when starting service.

We were not changing the service's state to running until the restart
throttling threshold had passed.  However best practice is to change the
status to running or stopped as quickly as possible.  Therefore we we
now report the status after no more than 20000 milliseconds regardless
of the throttle setting.

diff --git a/messages.mc b/messages.mc
index 2ab7dc1..930e9e5 100644 (file)
--- a/messages.mc
+++ b/messages.mc
@@ -1376,3 +1376,16 @@ Language = Italian
 Chiamata a CreateThread() fallita:
 %1
 .
+
+MessageId = +1
+SymbolicName = NSSM_EVENT_STARTUP_DELAY_TOO_LONG
+Severity = Informational
+Language = English
+The minimum number of milliseconds which must pass before service %1 is considered to have been started successfully is set to %2.  Access to the Windows service control manager is blocked until the service updates its status, therefore %3 will wait a maximum of %4 milliseconds before reporting the service's state as running.  Service restart throttling will be enforced if the service runs for less than the full %2 milliseconds.
+.
+Language = French
+The minimum number of milliseconds which must pass before service %1 is considered to have been started successfully is set to %2.  Access to the Windows service control manager is blocked until the service updates its status, therefore %3 will wait a maximum of %4 milliseconds before reporting the service's state as running.  Service restart throttling will be enforced if the service runs for less than the full %2 milliseconds.
+.
+Language = Italian
+The minimum number of milliseconds which must pass before service %1 is considered to have been started successfully is set to %2.  Access to the Windows service control manager is blocked until the service updates its status, therefore %3 will wait a maximum of %4 milliseconds before reporting the service's state as running.  Service restart throttling will be enforced if the service runs for less than the full %2 milliseconds.
+.

diff --git a/nssm.h b/nssm.h
index 1c1937c..1479f10 100644 (file)
--- a/nssm.h
+++ b/nssm.h
@@ -67,6 +67,6 @@ int str_equiv(const char *, const char *);
 #define NSSM_STOP_METHOD_TERMINATE (1 << 3)\r
 \r
 /* How many milliseconds to wait before updating service status. */\r
-#define NSSM_SHUTDOWN_CHECKPOINT 20000\r
+#define NSSM_SERVICE_STATUS_DEADLINE 20000\r
 \r
 #endif\r

diff --git a/service.cpp b/service.cpp
index c24263f..be70501 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -450,13 +450,34 @@ int start_service() {
 \r
   close_output_handles(&si);\r
 \r
-  /* Wait for a clean startup. */\r
-  if (WaitForSingleObject(process_handle, throttle_delay) == WAIT_TIMEOUT) throttle = 0;\r
+  /*\r
+    Wait for a clean startup before changing the service status to RUNNING\r
+    but be mindful of the fact that we are blocking the service control manager\r
+    so abandon the wait before too much time has elapsed.\r
+  */\r
+  unsigned long delay = throttle_delay;\r
+  if (delay > NSSM_SERVICE_STATUS_DEADLINE) {\r
+    char delay_milliseconds[16];\r
+    _snprintf_s(delay_milliseconds, sizeof(delay_milliseconds), _TRUNCATE, "%lu", delay);\r
+    char deadline_milliseconds[16];\r
+    _snprintf_s(deadline_milliseconds, sizeof(deadline_milliseconds), _TRUNCATE, "%lu", NSSM_SERVICE_STATUS_DEADLINE);\r
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_STARTUP_DELAY_TOO_LONG, service_name, delay_milliseconds, NSSM, deadline_milliseconds, 0);\r
+    delay = NSSM_SERVICE_STATUS_DEADLINE;\r
+  }\r
+  unsigned long deadline = WaitForSingleObject(process_handle, delay);\r
 \r
   /* Signal successful start */\r
   service_status.dwCurrentState = SERVICE_RUNNING;\r
   SetServiceStatus(service_handle, &service_status);\r
 \r
+  /* Continue waiting for a clean startup. */\r
+  if (deadline == WAIT_TIMEOUT) {\r
+    if (throttle_delay > delay) {\r
+      if (WaitForSingleObject(process_handle, throttle_delay - delay) == WAIT_TIMEOUT) throttle = 0;\r
+    }\r
+    else throttle = 0;\r
+  }\r
+\r
   return 0;\r
 }\r
 \r
@@ -639,9 +660,10 @@ void throttle_restart() {
   time dwCheckPoint is also increased.\r
 \r
   Our strategy then is to retrieve the initial dwWaitHint and wait for\r
-  NSSM_SHUTDOWN_CHECKPOINT milliseconds.  If the process is still running and\r
-  we haven't finished waiting we increment dwCheckPoint and add whichever is\r
-  smaller of NSSM_SHUTDOWN_CHECKPOINT or the remaining timeout to dwWaitHint.\r
+  NSSM_SERVICE_STATUS_DEADLINE milliseconds.  If the process is still running\r
+  and we haven't finished waiting we increment dwCheckPoint and add whichever is\r
+  smaller of NSSM_SERVICE_STATUS_DEADLINE or the remaining timeout to\r
+  dwWaitHint.\r
 \r
   Only doing both these things will prevent the system from killing the service.\r
 \r
@@ -672,7 +694,7 @@ int await_shutdown(char *function_name, char *service_name, SERVICE_STATUS_HANDL
   waited = 0;\r
   while (waited < timeout) {\r
     interval = timeout - waited;\r
-    if (interval > NSSM_SHUTDOWN_CHECKPOINT) interval = NSSM_SHUTDOWN_CHECKPOINT;\r
+    if (interval > NSSM_SERVICE_STATUS_DEADLINE) interval = NSSM_SERVICE_STATUS_DEADLINE;\r
 \r
     service_status->dwCurrentState = SERVICE_STOP_PENDING;\r
     service_status->dwWaitHint += interval;\r