Kill process tree from the top down.

[nssm.git] / service.cpp

diff --git a/service.cpp b/service.cpp
index 284b5ec..5a732b0 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -1517,7 +1517,6 @@ int start_service(nssm_service_t *service) {
   TCHAR cmd[CMD_LENGTH];\r
   if (_sntprintf_s(cmd, _countof(cmd), _TRUNCATE, _T("\"%s\" %s"), service->exe, service->flags) < 0) {\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("command line"), _T("start_service"), 0);\r
-    close_output_handles(&si);\r
     return stop_service(service, 2, true, true);\r
   }\r
 \r
@@ -1527,6 +1526,14 @@ int start_service(nssm_service_t *service) {
   if (service->env) duplicate_environment(service->env);\r
   if (service->env_extra) set_environment_block(service->env_extra);\r
 \r
+  /* Set up I/O redirection. */\r
+  if (get_output_handles(service, &si)) {\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_OUTPUT_HANDLES_FAILED, service->name, 0);\r
+    if (! service->no_console) FreeConsole();\r
+    close_output_handles(&si);\r
+    return stop_service(service, 4, true, true);\r
+  }\r
+\r
   bool inherit_handles = false;\r
   if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;\r
   unsigned long flags = service->priority & priority_mask();\r
@@ -1546,6 +1553,8 @@ int start_service(nssm_service_t *service) {
 \r
   close_output_handles(&si);\r
 \r
+  if (! service->no_console) FreeConsole();\r
+\r
   /* Restore our environment. */\r
   duplicate_environment(service->initial_env);\r
 \r
@@ -1671,15 +1680,18 @@ void CALLBACK end_service(void *arg, unsigned char why) {
 \r
   service->rotate_stdout_online = service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
 \r
+  /* Use now as a dummy exit time. */\r
+  GetSystemTimeAsFileTime(&service->exit_time);\r
+\r
   /* Check exit code */\r
   unsigned long exitcode = 0;\r
   TCHAR code[16];\r
   if (service->process_handle) {\r
     GetExitCodeProcess(service->process_handle, &exitcode);\r
-    if (exitcode == STILL_ACTIVE || get_process_exit_time(service->process_handle, &service->exit_time)) GetSystemTimeAsFileTime(&service->exit_time);\r
+    /* Check real exit time. */\r
+    if (exitcode != STILL_ACTIVE) get_process_exit_time(service->process_handle, &service->exit_time);\r
     CloseHandle(service->process_handle);\r
   }\r
-  else GetSystemTimeAsFileTime(&service->exit_time);\r
 \r
   service->process_handle = 0;\r
 \r