Enable on-demand rotation.
[nssm.git] / service.cpp
index 296d416..b8c73ef 100644 (file)
@@ -11,10 +11,160 @@ extern settings_t settings[];
 \r
 const TCHAR *exit_action_strings[] = { _T("Restart"), _T("Ignore"), _T("Exit"), _T("Suicide"), 0 };\r
 const TCHAR *startup_strings[] = { _T("SERVICE_AUTO_START"), _T("SERVICE_DELAYED_AUTO_START"), _T("SERVICE_DEMAND_START"), _T("SERVICE_DISABLED"), 0 };\r
+const TCHAR *priority_strings[] = { _T("REALTIME_PRIORITY_CLASS"), _T("HIGH_PRIORITY_CLASS"), _T("ABOVE_NORMAL_PRIORITY_CLASS"), _T("NORMAL_PRIORITY_CLASS"), _T("BELOW_NORMAL_PRIORITY_CLASS"), _T("IDLE_PRIORITY_CLASS"), 0 };\r
 \r
-static inline int throttle_milliseconds(unsigned long throttle) {\r
+typedef struct {\r
+  int first;\r
+  int last;\r
+} list_t;\r
+\r
+int affinity_mask_to_string(__int64 mask, TCHAR **string) {\r
+  if (! string) return 1;\r
+  if (! mask) {\r
+    *string = 0;\r
+    return 0;\r
+  }\r
+\r
+  __int64 i, n;\r
+\r
+  /* SetProcessAffinityMask() accepts a mask of up to 64 processors. */\r
+  list_t set[64];\r
+  for (n = 0; n < _countof(set); n++) set[n].first = set[n].last = -1;\r
+\r
+  for (i = 0, n = 0; i < _countof(set); i++) {\r
+    if (mask & (1LL << i)) {\r
+      if (set[n].first == -1) set[n].first = set[n].last = (int) i;\r
+      else if (set[n].last == (int) i - 1) set[n].last = (int) i;\r
+      else {\r
+        n++;\r
+        set[n].first = set[n].last = (int) i;\r
+      }\r
+    }\r
+  }\r
+\r
+  /* Worst case is 2x2 characters for first and last CPU plus - and/or , */\r
+  size_t len = (size_t) (n + 1) * 6;\r
+  *string = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(TCHAR));\r
+  if (! string) return 2;\r
+\r
+  size_t s = 0;\r
+  int ret;\r
+  for (i = 0; i <= n; i++) {\r
+    if (i) (*string)[s++] = _T(',');\r
+    ret = _sntprintf_s(*string + s, 3, _TRUNCATE, _T("%u"), set[i].first);\r
+    if (ret < 0) {\r
+      HeapFree(GetProcessHeap(), 0, *string);\r
+      *string = 0;\r
+      return 3;\r
+    }\r
+    else s += ret;\r
+    if (set[i].last != set[i].first) {\r
+      ret =_sntprintf_s(*string + s, 4, _TRUNCATE, _T("%c%u"), (set[i].last == set[i].first + 1) ? _T(',') : _T('-'), set[i].last);\r
+      if (ret < 0) {\r
+        HeapFree(GetProcessHeap(), 0, *string);\r
+        *string = 0;\r
+        return 4;\r
+      }\r
+      else s += ret;\r
+    }\r
+  }\r
+\r
+  return 0;\r
+}\r
+\r
+int affinity_string_to_mask(TCHAR *string, __int64 *mask) {\r
+  if (! mask) return 1;\r
+\r
+  *mask = 0LL;\r
+  if (! string) return 0;\r
+\r
+  list_t set[64];\r
+\r
+  TCHAR *s = string;\r
+  TCHAR *end;\r
+  int ret;\r
+  int i;\r
+  int n = 0;\r
+  unsigned long number;\r
+\r
+  for (n = 0; n < _countof(set); n++) set[n].first = set[n].last = -1;\r
+  n = 0;\r
+\r
+  while (*s) {\r
+    ret = str_number(s, &number, &end);\r
+    s = end;\r
+    if (ret == 0 || ret == 2) {\r
+      if (number >= _countof(set)) return 2;\r
+      set[n].first = set[n].last = (int) number;\r
+\r
+      switch (*s) {\r
+        case 0:\r
+          break;\r
+\r
+        case _T(','):\r
+          n++;\r
+          s++;\r
+          break;\r
+\r
+        case _T('-'):\r
+          if (! *(++s)) return 3;\r
+          ret = str_number(s, &number, &end);\r
+          if (ret == 0 || ret == 2) {\r
+            s = end;\r
+            if (! *s || *s == _T(',')) {\r
+              set[n].last = (int) number;\r
+              if (! *s) break;\r
+              n++;\r
+              s++;\r
+            }\r
+            else return 3;\r
+          }\r
+          else return 3;\r
+          break;\r
+\r
+        default:\r
+          return 3;\r
+      }\r
+    }\r
+    else return 4;\r
+  }\r
+\r
+  for (i = 0; i <= n; i++) {\r
+    for (int j = set[i].first; j <= set[i].last; j++) (__int64) *mask |= (1LL << (__int64) j);\r
+  }\r
+\r
+  return 0;\r
+}\r
+\r
+inline unsigned long priority_mask() {\r
+ return REALTIME_PRIORITY_CLASS | HIGH_PRIORITY_CLASS | ABOVE_NORMAL_PRIORITY_CLASS | NORMAL_PRIORITY_CLASS | BELOW_NORMAL_PRIORITY_CLASS | IDLE_PRIORITY_CLASS;\r
+}\r
+\r
+int priority_constant_to_index(unsigned long constant) {\r
+  switch (constant & priority_mask()) {\r
+    case REALTIME_PRIORITY_CLASS: return NSSM_REALTIME_PRIORITY;\r
+    case HIGH_PRIORITY_CLASS: return NSSM_HIGH_PRIORITY;\r
+    case ABOVE_NORMAL_PRIORITY_CLASS: return NSSM_ABOVE_NORMAL_PRIORITY;\r
+    case BELOW_NORMAL_PRIORITY_CLASS: return NSSM_BELOW_NORMAL_PRIORITY;\r
+    case IDLE_PRIORITY_CLASS: return NSSM_IDLE_PRIORITY;\r
+  }\r
+  return NSSM_NORMAL_PRIORITY;\r
+}\r
+\r
+unsigned long priority_index_to_constant(int index) {\r
+  switch (index) {\r
+    case NSSM_REALTIME_PRIORITY: return REALTIME_PRIORITY_CLASS;\r
+    case NSSM_HIGH_PRIORITY: return HIGH_PRIORITY_CLASS;\r
+    case NSSM_ABOVE_NORMAL_PRIORITY: return ABOVE_NORMAL_PRIORITY_CLASS;\r
+    case NSSM_BELOW_NORMAL_PRIORITY: return BELOW_NORMAL_PRIORITY_CLASS;\r
+    case NSSM_IDLE_PRIORITY: return IDLE_PRIORITY_CLASS;\r
+  }\r
+  return NORMAL_PRIORITY_CLASS;\r
+}\r
+\r
+static inline unsigned long throttle_milliseconds(unsigned long throttle) {\r
   /* pow() operates on doubles. */\r
-  int ret = 1; for (unsigned long i = 1; i < throttle; i++) ret *= 2;\r
+  unsigned long ret = 1; for (unsigned long i = 1; i < throttle; i++) ret *= 2;\r
   return ret * 1000;\r
 }\r
 \r
@@ -37,6 +187,85 @@ SC_HANDLE open_service_manager() {
   return ret;\r
 }\r
 \r
+/* Open a service by name or display name. */\r
+SC_HANDLE open_service(SC_HANDLE services, TCHAR *service_name, TCHAR *canonical_name, unsigned long canonical_namelen) {\r
+  SC_HANDLE service_handle = OpenService(services, service_name, SERVICE_ALL_ACCESS);\r
+  if (service_handle) {\r
+    if (canonical_name && canonical_name != service_name) {\r
+      if (_sntprintf_s(canonical_name, canonical_namelen, _TRUNCATE, _T("%s"), service_name) < 0) {\r
+        print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("canonical_name"), _T("open_service()"));\r
+        return 0;\r
+      }\r
+    }\r
+    return service_handle;\r
+  }\r
+\r
+  unsigned long error = GetLastError();\r
+  if (error != ERROR_SERVICE_DOES_NOT_EXIST) {\r
+    print_message(stderr, NSSM_MESSAGE_OPENSERVICE_FAILED, error_string(GetLastError()));\r
+    return 0;\r
+  }\r
+\r
+  /* We can't look for a display name because there's no buffer to store it. */\r
+  if (! canonical_name) {\r
+    print_message(stderr, NSSM_MESSAGE_OPENSERVICE_FAILED, error_string(GetLastError()));\r
+    return 0;\r
+  }\r
+\r
+  unsigned long bufsize, required, count, i;\r
+  unsigned long resume = 0;\r
+  EnumServicesStatus(services, SERVICE_DRIVER | SERVICE_FILE_SYSTEM_DRIVER | SERVICE_KERNEL_DRIVER | SERVICE_WIN32, SERVICE_STATE_ALL, 0, 0, &required, &count, &resume);\r
+  error = GetLastError();\r
+  if (error != ERROR_MORE_DATA) {\r
+    print_message(stderr, NSSM_MESSAGE_ENUMSERVICESSTATUS_FAILED, error_string(GetLastError()));\r
+    return 0;\r
+  }\r
+\r
+  ENUM_SERVICE_STATUS *status = (ENUM_SERVICE_STATUS *) HeapAlloc(GetProcessHeap(), 0, required);\r
+  if (! status) {\r
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("ENUM_SERVICE_STATUS"), _T("open_service()"));\r
+    return 0;\r
+  }\r
+\r
+  bufsize = required;\r
+  while (true) {\r
+    /*\r
+      EnumServicesStatus() returns:\r
+      1 when it retrieved data and there's no more data to come.\r
+      0 and sets last error to ERROR_MORE_DATA when it retrieved data and\r
+        there's more data to come.\r
+      0 and sets last error to something else on error.\r
+    */\r
+    int ret = EnumServicesStatus(services, SERVICE_DRIVER | SERVICE_FILE_SYSTEM_DRIVER | SERVICE_KERNEL_DRIVER | SERVICE_WIN32, SERVICE_STATE_ALL, status, bufsize, &required, &count, &resume);\r
+    if (! ret) {\r
+      error = GetLastError();\r
+      if (error != ERROR_MORE_DATA) {\r
+        HeapFree(GetProcessHeap(), 0, status);\r
+        print_message(stderr, NSSM_MESSAGE_ENUMSERVICESSTATUS_FAILED, error_string(GetLastError()));\r
+        return 0;\r
+      }\r
+    }\r
+\r
+    for (i = 0; i < count; i++) {\r
+      if (str_equiv(status[i].lpDisplayName, service_name)) {\r
+        if (_sntprintf_s(canonical_name, canonical_namelen, _TRUNCATE, _T("%s"), status[i].lpServiceName) < 0) {\r
+          HeapFree(GetProcessHeap(), 0, status);\r
+          print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("canonical_name"), _T("open_service()"));\r
+          return 0;\r
+        }\r
+\r
+        HeapFree(GetProcessHeap(), 0, status);\r
+        return open_service(services, canonical_name, 0, 0);\r
+      }\r
+    }\r
+\r
+    if (ret) break;\r
+  }\r
+\r
+  /* Recurse so we can get an error message. */\r
+  return open_service(services, service_name, 0, 0);\r
+}\r
+\r
 QUERY_SERVICE_CONFIG *query_service_config(const TCHAR *service_name, SC_HANDLE service_handle) {\r
   QUERY_SERVICE_CONFIG *qsc;\r
   unsigned long bufsize;\r
@@ -183,6 +412,7 @@ int get_service_username(const TCHAR *service_name, const QUERY_SERVICE_CONFIG *
 }\r
 \r
 int grant_logon_as_service(const TCHAR *username) {\r
+  if (! username) return 0;\r
   if (str_equiv(username, NSSM_LOCALSYSTEM_ACCOUNT)) return 0;\r
 \r
   /* Open Policy object. */\r
@@ -206,7 +436,7 @@ int grant_logon_as_service(const TCHAR *username) {
 #else\r
   size_t buflen;\r
   mbstowcs_s(&buflen, NULL, 0, username, _TRUNCATE);\r
-  lsa_username.MaximumLength = buflen * sizeof(wchar_t);\r
+  lsa_username.MaximumLength = (unsigned short) buflen * sizeof(wchar_t);\r
   lsa_username.Length = lsa_username.MaximumLength - sizeof(wchar_t);\r
   lsa_username.Buffer = (wchar_t *) HeapAlloc(GetProcessHeap(), 0, lsa_username.MaximumLength);\r
   if (lsa_username.Buffer) mbstowcs_s(&buflen, lsa_username.Buffer, lsa_username.MaximumLength, username, _TRUNCATE);\r
@@ -333,6 +563,7 @@ void set_nssm_service_defaults(nssm_service_t *service) {
   if (! service) return;\r
 \r
   service->type = SERVICE_WIN32_OWN_PROCESS;\r
+  service->priority = NORMAL_PRIORITY_CLASS;\r
   service->stdin_sharing = NSSM_STDIN_SHARING;\r
   service->stdin_disposition = NSSM_STDIN_DISPOSITION;\r
   service->stdin_flags = NSSM_STDIN_FLAGS;\r
@@ -491,10 +722,9 @@ int pre_edit_service(int argc, TCHAR **argv) {
   }\r
 \r
   /* Try to open the service */\r
-  service->handle = OpenService(services, service->name, SC_MANAGER_ALL_ACCESS);\r
+  service->handle = open_service(services, service->name, service->name, _countof(service->name));\r
   if (! service->handle) {\r
     CloseServiceHandle(services);\r
-    print_message(stderr, NSSM_MESSAGE_OPENSERVICE_FAILED);\r
     return 3;\r
   }\r
 \r
@@ -703,9 +933,9 @@ int install_service(nssm_service_t *service) {
   GetModuleFileName(0, service->image, _countof(service->image));\r
 \r
   /* Create the service - settings will be changed in edit_service() */\r
-  service->handle = CreateService(services, service->name, service->name, SC_MANAGER_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, service->image, 0, 0, 0, 0, 0);\r
+  service->handle = CreateService(services, service->name, service->name, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, service->image, 0, 0, 0, 0, 0);\r
   if (! service->handle) {\r
-    print_message(stderr, NSSM_MESSAGE_CREATESERVICE_FAILED);\r
+    print_message(stderr, NSSM_MESSAGE_CREATESERVICE_FAILED, error_string(GetLastError()));\r
     CloseServiceHandle(services);\r
     return 5;\r
   }\r
@@ -802,6 +1032,106 @@ int edit_service(nssm_service_t *service, bool editing) {
   return 0;\r
 }\r
 \r
+/* Control a service. */\r
+int control_service(unsigned long control, int argc, TCHAR **argv) {\r
+  if (argc < 1) return usage(1);\r
+  TCHAR *service_name = argv[0];\r
+  TCHAR canonical_name[SERVICE_NAME_LENGTH];\r
+\r
+  SC_HANDLE services = open_service_manager();\r
+  if (! services) {\r
+    print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);\r
+    return 2;\r
+  }\r
+\r
+  SC_HANDLE service_handle = open_service(services, service_name, canonical_name, _countof(canonical_name));\r
+  if (! service_handle) {\r
+    CloseServiceHandle(services);\r
+    return 3;\r
+  }\r
+\r
+  int ret;\r
+  unsigned long error;\r
+  SERVICE_STATUS service_status;\r
+  if (control == 0) {\r
+    ret = StartService(service_handle, (unsigned long) argc, (const TCHAR **) argv);\r
+    error = GetLastError();\r
+    CloseHandle(service_handle);\r
+    CloseServiceHandle(services);\r
+\r
+    if (error == ERROR_IO_PENDING) {\r
+      /*\r
+        Older versions of Windows return immediately with ERROR_IO_PENDING\r
+        indicate that the operation is still in progress.  Newer versions\r
+        will return it if there really is a delay.  As far as we're\r
+        concerned the operation is a success.  We don't claim to offer a\r
+        fully-feature service control method; it's just a quick 'n' dirty\r
+        interface.\r
+\r
+        In the future we may identify and handle this situation properly.\r
+      */\r
+      ret = 1;\r
+      error = ERROR_SUCCESS;\r
+    }\r
+\r
+    if (ret) {\r
+      _tprintf(_T("%s: %s"), canonical_name, error_string(error));\r
+      return 0;\r
+    }\r
+    else {\r
+      _ftprintf(stderr, _T("%s: %s"), canonical_name, error_string(error));\r
+      return 1;\r
+    }\r
+  }\r
+  else if (control == SERVICE_CONTROL_INTERROGATE) {\r
+    /*\r
+      We could actually send an INTERROGATE control but that won't return\r
+      any information if the service is stopped and we don't care about\r
+      the extra details it might give us in any case.  So we'll fake it.\r
+    */\r
+    ret = QueryServiceStatus(service_handle, &service_status);\r
+    error = GetLastError();\r
+\r
+    if (ret) {\r
+      switch (service_status.dwCurrentState) {\r
+        case SERVICE_STOPPED: _tprintf(_T("SERVICE_STOPPED\n")); break;\r
+        case SERVICE_START_PENDING: _tprintf(_T("SERVICE_START_PENDING\n")); break;\r
+        case SERVICE_STOP_PENDING: _tprintf(_T("SERVICE_STOP_PENDING\n")); break;\r
+        case SERVICE_RUNNING: _tprintf(_T("SERVICE_RUNNING\n")); break;\r
+        case SERVICE_CONTINUE_PENDING: _tprintf(_T("SERVICE_CONTINUE_PENDING\n")); break;\r
+        case SERVICE_PAUSE_PENDING: _tprintf(_T("SERVICE_PAUSE_PENDING\n")); break;\r
+        case SERVICE_PAUSED: _tprintf(_T("SERVICE_PAUSED\n")); break;\r
+        default: _tprintf(_T("?\n")); return 1;\r
+      }\r
+      return 0;\r
+    }\r
+    else {\r
+      _ftprintf(stderr, _T("%s: %s\n"), canonical_name, error_string(error));\r
+      return 1;\r
+    }\r
+  }\r
+  else {\r
+    ret = ControlService(service_handle, control, &service_status);\r
+    error = GetLastError();\r
+    CloseHandle(service_handle);\r
+    CloseServiceHandle(services);\r
+\r
+    if (error == ERROR_IO_PENDING) {\r
+      ret = 1;\r
+      error = ERROR_SUCCESS;\r
+    }\r
+\r
+    if (ret) {\r
+      _tprintf(_T("%s: %s"), canonical_name, error_string(error));\r
+      return 0;\r
+    }\r
+    else {\r
+      _ftprintf(stderr, _T("%s: %s"), canonical_name, error_string(error));\r
+      return 1;\r
+    }\r
+  }\r
+}\r
+\r
 /* Remove the service */\r
 int remove_service(nssm_service_t *service) {\r
   if (! service) return 1;\r
@@ -814,9 +1144,8 @@ int remove_service(nssm_service_t *service) {
   }\r
 \r
   /* Try to open the service */\r
-  service->handle = OpenService(services, service->name, SC_MANAGER_ALL_ACCESS);\r
+  service->handle = open_service(services, service->name, service->name, _countof(service->name));\r
   if (! service->handle) {\r
-    print_message(stderr, NSSM_MESSAGE_OPENSERVICE_FAILED);\r
     CloseServiceHandle(services);\r
     return 3;\r
   }\r
@@ -952,6 +1281,7 @@ TCHAR *service_control_text(unsigned long control) {
     case SERVICE_CONTROL_PAUSE: return _T("PAUSE");\r
     case SERVICE_CONTROL_CONTINUE: return _T("CONTINUE");\r
     case SERVICE_CONTROL_INTERROGATE: return _T("INTERROGATE");\r
+    case NSSM_SERVICE_CONTROL_ROTATE: return _T("ROTATE");\r
     default: return 0;\r
   }\r
 }\r
@@ -1039,6 +1369,12 @@ unsigned long WINAPI service_control_handler(unsigned long control, unsigned lon
       */\r
       log_service_control(service->name, control, false);\r
       return ERROR_CALL_NOT_IMPLEMENTED;\r
+\r
+    case NSSM_SERVICE_CONTROL_ROTATE:\r
+      log_service_control(service->name, control, true);\r
+      if (service->rotate_stdout_online) service->rotate_stdout_online = NSSM_ROTATE_ONLINE_ASAP;\r
+      if (service->rotate_stdout_online) service->rotate_stderr_online = NSSM_ROTATE_ONLINE_ASAP;\r
+      return NO_ERROR;\r
   }\r
 \r
   /* Unknown control */\r
@@ -1081,7 +1417,8 @@ int start_service(nssm_service_t *service) {
 \r
   bool inherit_handles = false;\r
   if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;\r
-  unsigned long flags = 0;\r
+  unsigned long flags = service->priority & priority_mask();\r
+  if (service->affinity) flags |= CREATE_SUSPENDED;\r
 #ifdef UNICODE\r
   flags |= CREATE_UNICODE_ENVIRONMENT;\r
 #endif\r
@@ -1101,7 +1438,36 @@ int start_service(nssm_service_t *service) {
 \r
   if (get_process_creation_time(service->process_handle, &service->creation_time)) ZeroMemory(&service->creation_time, sizeof(service->creation_time));\r
 \r
-  close_output_handles(&si);\r
+  close_output_handles(&si, ! service->rotate_stdout_online, ! service->rotate_stderr_online);\r
+\r
+  if (service->affinity) {\r
+    /*\r
+      We are explicitly storing service->affinity as a 64-bit unsigned integer\r
+      so that we can parse it regardless of whether we're running in 32-bit\r
+      or 64-bit mode.  The arguments to SetProcessAffinityMask(), however, are\r
+      defined as type DWORD_PTR and hence limited to 32 bits on a 32-bit system\r
+      (or when running the 32-bit NSSM).\r
+\r
+      The result is a lot of seemingly-unnecessary casting throughout the code\r
+      and potentially confusion when we actually try to start the service.\r
+      Having said that, however, it's unlikely that we're actually going to\r
+      run in 32-bit mode on a system which has more than 32 CPUs so the\r
+      likelihood of seeing a confusing situation is somewhat diminished.\r
+    */\r
+    DWORD_PTR affinity, system_affinity;\r
+\r
+    if (GetProcessAffinityMask(service->process_handle, &affinity, &system_affinity)) affinity = service->affinity & system_affinity;\r
+    else {\r
+      affinity = (DWORD_PTR) service->affinity;\r
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GETPROCESSAFFINITYMASK_FAILED, service->name, error_string(GetLastError()), 0);\r
+    }\r
+\r
+    if (! SetProcessAffinityMask(service->process_handle, affinity)) {\r
+      log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_SETPROCESSAFFINITYMASK_FAILED, service->name, error_string(GetLastError()), 0);\r
+    }\r
+\r
+    ResumeThread(pi.hThread);\r
+  }\r
 \r
   /*\r
     Wait for a clean startup before changing the service status to RUNNING\r
@@ -1131,6 +1497,9 @@ int start_service(nssm_service_t *service) {
     else service->throttle = 0;\r
   }\r
 \r
+  /* Ensure the restart delay is always applied. */\r
+  if (service->restart_delay && ! service->throttle) service->throttle++;\r
+\r
   return 0;\r
 }\r
 \r
@@ -1273,14 +1642,22 @@ void throttle_restart(nssm_service_t *service) {
   /* This can't be a restart if the service is already running. */\r
   if (! service->throttle++) return;\r
 \r
-  int ms = throttle_milliseconds(service->throttle);\r
+  unsigned long ms;\r
+  unsigned long throttle_ms = throttle_milliseconds(service->throttle);\r
+  TCHAR threshold[8], milliseconds[8];\r
+\r
+  if (service->restart_delay > throttle_ms) ms = service->restart_delay;\r
+  else ms = throttle_ms;\r
 \r
   if (service->throttle > 7) service->throttle = 8;\r
 \r
-  TCHAR threshold[8], milliseconds[8];\r
-  _sntprintf_s(threshold, _countof(threshold), _TRUNCATE, _T("%lu"), service->throttle_delay);\r
   _sntprintf_s(milliseconds, _countof(milliseconds), _TRUNCATE, _T("%lu"), ms);\r
-  log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_THROTTLED, service->name, threshold, milliseconds, 0);\r
+\r
+  if (service->throttle == 1 && service->restart_delay > throttle_ms) log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_RESTART_DELAY, service->name, milliseconds, 0);\r
+  else {\r
+    _sntprintf_s(threshold, _countof(threshold), _TRUNCATE, _T("%lu"), service->throttle_delay);\r
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_THROTTLED, service->name, threshold, milliseconds, 0);\r
+  }\r
 \r
   if (use_critical_section) EnterCriticalSection(&service->throttle_section);\r
   else if (service->throttle_timer) {\r