\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
+/*\r
+ Check the status in response to a control.\r
+ Returns: 1 if the status is expected, eg STOP following CONTROL_STOP.\r
+ 0 if the status is desired, eg STOPPED following CONTROL_STOP.\r
+ -1 if the status is undesired, eg STOPPED following CONTROL_START.\r
+*/\r
+static inline int service_control_response(unsigned long control, unsigned long status) {\r
+ switch (control) {\r
+ case NSSM_SERVICE_CONTROL_START:\r
+ switch (status) {\r
+ case SERVICE_START_PENDING:\r
+ return 1;\r
+\r
+ case SERVICE_RUNNING:\r
+ return 0;\r
+\r
+ default:\r
+ return -1;\r
+ }\r
+\r
+ case SERVICE_CONTROL_STOP:\r
+ case SERVICE_CONTROL_SHUTDOWN:\r
+ switch (status) {\r
+ case SERVICE_STOP_PENDING:\r
+ return 1;\r
+\r
+ case SERVICE_STOPPED:\r
+ return 0;\r
+\r
+ default:\r
+ return -1;\r
+ }\r
+\r
+ case SERVICE_CONTROL_PAUSE:\r
+ switch (status) {\r
+ case SERVICE_PAUSE_PENDING:\r
+ return 1;\r
+\r
+ case SERVICE_PAUSED:\r
+ return 0;\r
+\r
+ default:\r
+ return -1;\r
+ }\r
+\r
+ case SERVICE_CONTROL_CONTINUE:\r
+ switch (status) {\r
+ case SERVICE_CONTINUE_PENDING:\r
+ return 1;\r
+\r
+ case SERVICE_RUNNING:\r
+ return 0;\r
+\r
+ default:\r
+ return -1;\r
+ }\r
+\r
+ case SERVICE_CONTROL_INTERROGATE:\r
+ return 0;\r
+ }\r
+\r
+ return 0;\r
+}\r
+\r
+static inline int await_service_control_response(unsigned long control, SC_HANDLE service_handle, SERVICE_STATUS *service_status, unsigned long initial_status) {\r
+ int tries = 0;\r
+ while (QueryServiceStatus(service_handle, service_status)) {\r
+ int response = service_control_response(control, service_status->dwCurrentState);\r
+ /* Alas we can't WaitForSingleObject() on an SC_HANDLE. */\r
+ if (! response) return response;\r
+ if (response > 0 || service_status->dwCurrentState == initial_status) {\r
+ if (++tries > 10) return response;\r
+ Sleep(50 * tries);\r
+ }\r
+ else return response;\r
+ }\r
+ return -1;\r
+}\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
}\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
#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
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
if (service->wait_handle) UnregisterWait(service->process_handle);\r
if (service->throttle_section_initialised) DeleteCriticalSection(&service->throttle_section);\r
if (service->throttle_timer) CloseHandle(service->throttle_timer);\r
+ if (service->initial_env) FreeEnvironmentStrings(service->initial_env);\r
HeapFree(GetProcessHeap(), 0, service);\r
}\r
\r
for (i = 0; settings[i].name; i++) _ftprintf(stderr, _T("%s\n"), settings[i].name);\r
return 1;\r
}\r
- if (argc < mandatory) return usage(1);\r
\r
additional = 0;\r
if (additional_mandatory) {\r
+ if (argc < mandatory) {\r
+ print_message(stderr, NSSM_MESSAGE_MISSING_SUBPARAMETER, parameter);\r
+ return 1;\r
+ }\r
additional = argv[3];\r
remainder = 4;\r
}\r
- else additional = argv[remainder];\r
+ else {\r
+ additional = argv[remainder];\r
+ if (argc < mandatory) return usage(1);\r
+ }\r
}\r
\r
nssm_service_t *service = alloc_nssm_service();\r
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
int ret;\r
unsigned long error;\r
SERVICE_STATUS service_status;\r
- if (control == 0) {\r
+ if (control == NSSM_SERVICE_CONTROL_START) {\r
+ unsigned long initial_status = SERVICE_STOPPED;\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.\r
+ */\r
+ ret = 1;\r
+ error = ERROR_SUCCESS;\r
+ }\r
+\r
if (ret) {\r
- _tprintf(_T("%s: %s"), canonical_name, error_string(error));\r
+ int response = await_service_control_response(control, service_handle, &service_status, initial_status);\r
+ CloseHandle(service_handle);\r
+\r
+ if (response) {\r
+ print_message(stderr, NSSM_MESSAGE_BAD_CONTROL_RESPONSE, canonical_name, service_status_text(service_status.dwCurrentState), service_control_text(control));\r
+ return 1;\r
+ }\r
+ else _tprintf(_T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));\r
return 0;\r
}\r
else {\r
- _ftprintf(stderr, _T("%s: %s"), canonical_name, error_string(error));\r
+ CloseHandle(service_handle);\r
+ _ftprintf(stderr, _T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));\r
return 1;\r
}\r
}\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
+ _tprintf(_T("%s\n"), service_status_text(service_status.dwCurrentState));\r
return 0;\r
}\r
else {\r
}\r
else {\r
ret = ControlService(service_handle, control, &service_status);\r
+ unsigned long initial_status = service_status.dwCurrentState;\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
+ int response = await_service_control_response(control, service_handle, &service_status, initial_status);\r
+ CloseHandle(service_handle);\r
+\r
+ if (response) {\r
+ print_message(stderr, NSSM_MESSAGE_BAD_CONTROL_RESPONSE, canonical_name, service_status_text(service_status.dwCurrentState), service_control_text(control));\r
+ return 1;\r
+ }\r
+ else _tprintf(_T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));\r
return 0;\r
}\r
else {\r
- _ftprintf(stderr, _T("%s: %s"), canonical_name, error_string(error));\r
+ CloseHandle(service_handle);\r
+ _ftprintf(stderr, _T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));\r
+ if (error == ERROR_SERVICE_NOT_ACTIVE) {\r
+ if (control == SERVICE_CONTROL_SHUTDOWN || control == SERVICE_CONTROL_STOP) return 0;\r
+ }\r
return 1;\r
}\r
}\r
}\r
}\r
\r
+ /* Remember our initial environment. */\r
+ service->initial_env = GetEnvironmentStrings();\r
+\r
monitor_service(service);\r
}\r
\r
TCHAR *service_control_text(unsigned long control) {\r
switch (control) {\r
/* HACK: there is no SERVICE_CONTROL_START constant */\r
- case 0: return _T("START");\r
+ case NSSM_SERVICE_CONTROL_START: return _T("START");\r
case SERVICE_CONTROL_STOP: return _T("STOP");\r
case SERVICE_CONTROL_SHUTDOWN: return _T("SHUTDOWN");\r
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
+\r
+TCHAR *service_status_text(unsigned long status) {\r
+ switch (status) {\r
+ case SERVICE_STOPPED: return _T("SERVICE_STOPPED");\r
+ case SERVICE_START_PENDING: return _T("SERVICE_START_PENDING");\r
+ case SERVICE_STOP_PENDING: return _T("SERVICE_STOP_PENDING");\r
+ case SERVICE_RUNNING: return _T("SERVICE_RUNNING");\r
+ case SERVICE_CONTINUE_PENDING: return _T("SERVICE_CONTINUE_PENDING");\r
+ case SERVICE_PAUSE_PENDING: return _T("SERVICE_PAUSE_PENDING");\r
+ case SERVICE_PAUSED: return _T("SERVICE_PAUSED");\r
default: return 0;\r
}\r
}\r
ZeroMemory(&service->throttle_duetime, sizeof(service->throttle_duetime));\r
SetWaitableTimer(service->throttle_timer, &service->throttle_duetime, 0, 0, 0, 0);\r
}\r
- service->status.dwCurrentState = SERVICE_CONTINUE_PENDING;\r
+ /* We can't continue if the application is running! */\r
+ if (! service->process_handle) service->status.dwCurrentState = SERVICE_CONTINUE_PENDING;\r
service->status.dwWaitHint = throttle_milliseconds(service->throttle) + NSSM_WAITHINT_MARGIN;\r
log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_RESET_THROTTLE, service->name, 0);\r
SetServiceStatus(service->status_handle, &service->status);\r
*/\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 == NSSM_ROTATE_ONLINE) service->rotate_stdout_online = NSSM_ROTATE_ONLINE_ASAP;\r
+ if (service->rotate_stderr_online == NSSM_ROTATE_ONLINE) service->rotate_stderr_online = NSSM_ROTATE_ONLINE_ASAP;\r
+ return NO_ERROR;\r
}\r
\r
/* Unknown control */\r
\r
throttle_restart(service);\r
\r
+ /* Set the environment. */\r
+ if (service->env) duplicate_environment(service->env);\r
+ if (service->env_extra) set_environment_block(service->env_extra);\r
+\r
bool inherit_handles = false;\r
if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;\r
- unsigned long flags = 0;\r
-#ifdef UNICODE\r
- flags |= CREATE_UNICODE_ENVIRONMENT;\r
-#endif\r
- if (! CreateProcess(0, cmd, 0, 0, inherit_handles, flags, service->env, service->dir, &si, &pi)) {\r
+ unsigned long flags = service->priority & priority_mask();\r
+ if (service->stdin_pipe) flags |= DETACHED_PROCESS;\r
+ if (service->affinity) flags |= CREATE_SUSPENDED;\r
+ if (! CreateProcess(0, cmd, 0, 0, inherit_handles, flags, 0, service->dir, &si, &pi)) {\r
unsigned long exitcode = 3;\r
unsigned long error = GetLastError();\r
- if (error == ERROR_INVALID_PARAMETER && service->env) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED_INVALID_ENVIRONMENT, service->name, service->exe, NSSM_REG_ENV, 0);\r
- if (test_environment(service->env)) exitcode = 4;\r
- }\r
- else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service->name, service->exe, error_string(error), 0);\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service->name, service->exe, error_string(error), 0);\r
close_output_handles(&si);\r
+ duplicate_environment(service->initial_env);\r
return stop_service(service, exitcode, true, true);\r
}\r
service->process_handle = pi.hProcess;\r
\r
close_output_handles(&si);\r
\r
+ /* Restore our environment. */\r
+ duplicate_environment(service->initial_env);\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
but be mindful of the fact that we are blocking the service control manager\r
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
UnregisterWait(service->wait_handle);\r
service->wait_handle = 0;\r
}\r
+ if (service->stdin_pipe) {\r
+ CloseHandle(service->stdin_pipe);\r
+ service->stdin_pipe = 0;\r
+ }\r
+\r
+ service->rotate_stdout_online = service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
\r
if (default_action && ! exitcode && ! graceful) {\r
log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_GRACEFUL_SUICIDE, service->name, service->exe, exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_REALLY], 0);\r
\r
service->stopping = true;\r
\r
+ service->rotate_stdout_online = service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
+\r
/* Check exit code */\r
unsigned long exitcode = 0;\r
TCHAR code[16];\r
/* 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