char dir[MAX_PATH];\r
bool stopping;\r
unsigned long throttle_delay;\r
+unsigned long stop_method;\r
HANDLE throttle_timer;\r
LARGE_INTEGER throttle_duetime;\r
FILETIME creation_time;\r
\r
/* Get startup parameters */\r
char *env = 0;\r
- int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir), &env, &throttle_delay);\r
+ int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir), &env, &throttle_delay, &stop_method, &si);\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
char cmd[CMD_LENGTH];\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
+ close_output_handles(&si);\r
return stop_service(2, true, true);\r
}\r
\r
throttle_restart();\r
\r
- if (! CreateProcess(0, cmd, 0, 0, false, 0, env, dir, &si, &pi)) {\r
+ bool inherit_handles = (si.dwFlags & STARTF_USESTDHANDLES);\r
+ if (! CreateProcess(0, cmd, 0, 0, inherit_handles, 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
+ close_output_handles(&si);\r
return stop_service(3, true, true);\r
}\r
process_handle = pi.hProcess;\r
\r
if (get_process_creation_time(process_handle, &creation_time)) ZeroMemory(&creation_time, sizeof(creation_time));\r
\r
- /* Signal successful start */\r
- service_status.dwCurrentState = SERVICE_RUNNING;\r
- SetServiceStatus(service_handle, &service_status);\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
+ /* Signal successful start */\r
+ service_status.dwCurrentState = SERVICE_RUNNING;\r
+ SetServiceStatus(service_handle, &service_status);\r
+\r
return 0;\r
}\r
\r
if (pid) {\r
/* Shut down service */\r
log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_TERMINATEPROCESS, service_name, exe, 0);\r
- kill_process(service_name, process_handle, pid, 0);\r
+ kill_process(service_name, stop_method, process_handle, pid, 0);\r
}\r
else log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_PROCESS_ALREADY_STOPPED, service_name, exe, 0);\r
\r
}\r
\r
/* Clean up. */\r
- kill_process_tree(service_name, pid, exitcode, pid, &creation_time, &exit_time);\r
+ kill_process_tree(service_name, stop_method, pid, exitcode, pid, &creation_time, &exit_time);\r
\r
/*\r
The why argument is true if our wait timed out or false otherwise.\r