Allow skipping kill_process_tree().

[nssm.git] / service.cpp

diff --git a/service.cpp b/service.cpp
index 4327a01..52937cf 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -689,6 +689,7 @@ void set_nssm_service_defaults(nssm_service_t *service) {
   service->kill_console_delay = NSSM_KILL_CONSOLE_GRACE_PERIOD;\r
   service->kill_window_delay = NSSM_KILL_WINDOW_GRACE_PERIOD;\r
   service->kill_threads_delay = NSSM_KILL_THREADS_GRACE_PERIOD;\r
+  service->kill_process_tree = 1;\r
 }\r
 \r
 /* Allocate and zero memory for a service. */\r
@@ -709,7 +710,7 @@ void cleanup_nssm_service(nssm_service_t *service) {
   if (service->dependencies) HeapFree(GetProcessHeap(), 0, service->dependencies);\r
   if (service->env) HeapFree(GetProcessHeap(), 0, service->env);\r
   if (service->env_extra) HeapFree(GetProcessHeap(), 0, service->env_extra);\r
-  if (service->handle) CloseHandle(service->handle);\r
+  if (service->handle) CloseServiceHandle(service->handle);\r
   if (service->process_handle) CloseHandle(service->process_handle);\r
   if (service->wait_handle) UnregisterWait(service->wait_handle);\r
   if (service->throttle_section_initialised) DeleteCriticalSection(&service->throttle_section);\r
@@ -856,7 +857,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   /* Get system details. */\r
   QUERY_SERVICE_CONFIG *qsc = query_service_config(service->name, service->handle);\r
   if (! qsc) {\r
-    CloseHandle(service->handle);\r
+    CloseServiceHandle(service->handle);\r
     CloseServiceHandle(services);\r
     return 4;\r
   }\r
@@ -865,7 +866,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   if (! (service->type & SERVICE_WIN32_OWN_PROCESS)) {\r
     if (mode != MODE_GETTING) {\r
       HeapFree(GetProcessHeap(), 0, qsc);\r
-      CloseHandle(service->handle);\r
+      CloseServiceHandle(service->handle);\r
       CloseServiceHandle(services);\r
       print_message(stderr, NSSM_MESSAGE_CANNOT_EDIT, service->name, NSSM_WIN32_OWN_PROCESS, 0);\r
       return 3;\r
@@ -875,7 +876,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   if (get_service_startup(service->name, service->handle, qsc, &service->startup)) {\r
     if (mode != MODE_GETTING) {\r
       HeapFree(GetProcessHeap(), 0, qsc);\r
-      CloseHandle(service->handle);\r
+      CloseServiceHandle(service->handle);\r
       CloseServiceHandle(services);\r
       return 4;\r
     }\r
@@ -884,7 +885,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   if (get_service_username(service->name, qsc, &service->username, &service->usernamelen)) {\r
     if (mode != MODE_GETTING) {\r
       HeapFree(GetProcessHeap(), 0, qsc);\r
-      CloseHandle(service->handle);\r
+      CloseServiceHandle(service->handle);\r
       CloseServiceHandle(services);\r
       return 5;\r
     }\r
@@ -903,7 +904,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   /* Get extended system details. */\r
   if (get_service_description(service->name, service->handle, _countof(service->description), service->description)) {\r
     if (mode != MODE_GETTING) {\r
-      CloseHandle(service->handle);\r
+      CloseServiceHandle(service->handle);\r
       CloseServiceHandle(services);\r
       return 6;\r
     }\r
@@ -911,7 +912,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
 \r
   if (get_service_dependencies(service->name, service->handle, &service->dependencies, &service->dependencieslen)) {\r
     if (mode != MODE_GETTING) {\r
-      CloseHandle(service->handle);\r
+      CloseServiceHandle(service->handle);\r
       CloseServiceHandle(services);\r
       return 7;\r
     }\r
@@ -935,7 +936,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
 \r
   /* Trying to manage App* parameters for a non-NSSM service. */\r
   if (! setting->native && service->native) {\r
-    CloseHandle(service->handle);\r
+    CloseServiceHandle(service->handle);\r
     print_message(stderr, NSSM_MESSAGE_NATIVE_PARAMETER, setting->name, NSSM);\r
     return 1;\r
   }\r
@@ -953,7 +954,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
     if (setting->native) ret = get_setting(service->name, service->handle, setting, &value, additional);\r
     else ret = get_setting(service->name, key, setting, &value, additional);\r
     if (ret < 0) {\r
-      CloseHandle(service->handle);\r
+      CloseServiceHandle(service->handle);\r
       return 5;\r
     }\r
 \r
@@ -971,7 +972,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
     }\r
 \r
     if (! service->native) RegCloseKey(key);\r
-    CloseHandle(service->handle);\r
+    CloseServiceHandle(service->handle);\r
     return 0;\r
   }\r
 \r
@@ -993,7 +994,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
     value.string = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, len * sizeof(TCHAR));\r
     if (! value.string) {\r
       print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("value"), _T("edit_service()"));\r
-      CloseHandle(service->handle);\r
+      CloseServiceHandle(service->handle);\r
       return 2;\r
     }\r
 \r
@@ -1026,12 +1027,12 @@ int pre_edit_service(int argc, TCHAR **argv) {
   if (value.string) HeapFree(GetProcessHeap(), 0, value.string);\r
   if (ret < 0) {\r
     if (! service->native) RegCloseKey(key);\r
-    CloseHandle(service->handle);\r
+    CloseServiceHandle(service->handle);\r
     return 6;\r
   }\r
 \r
   if (! service->native) RegCloseKey(key);\r
-  CloseHandle(service->handle);\r
+  CloseServiceHandle(service->handle);\r
 \r
   return 0;\r
 }\r
@@ -1241,7 +1242,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
 \r
     if (ret) {\r
       int response = await_service_control_response(control, service_handle, &service_status, initial_status);\r
-      CloseHandle(service_handle);\r
+      CloseServiceHandle(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
@@ -1251,7 +1252,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
       return 0;\r
     }\r
     else {\r
-      CloseHandle(service_handle);\r
+      CloseServiceHandle(service_handle);\r
       _ftprintf(stderr, _T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));\r
       return 1;\r
     }\r
@@ -1287,7 +1288,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
 \r
     if (ret) {\r
       int response = await_service_control_response(control, service_handle, &service_status, initial_status);\r
-      CloseHandle(service_handle);\r
+      CloseServiceHandle(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
@@ -1297,7 +1298,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
       return 0;\r
     }\r
     else {\r
-      CloseHandle(service_handle);\r
+      CloseServiceHandle(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
@@ -1362,7 +1363,7 @@ void WINAPI service_main(unsigned long argc, TCHAR **argv) {
   /* Initialise status */\r
   ZeroMemory(&service->status, sizeof(service->status));\r
   service->status.dwServiceType = SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS;\r
-  service->status.dwControlsAccepted = SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_PAUSE_CONTINUE;\r
+  service->status.dwControlsAccepted = SERVICE_ACCEPT_POWEREVENT | SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_PAUSE_CONTINUE;\r
   service->status.dwWin32ExitCode = NO_ERROR;\r
   service->status.dwServiceSpecificExitCode = 0;\r
   service->status.dwCheckPoint = 0;\r
@@ -1460,6 +1461,7 @@ TCHAR *service_control_text(unsigned long control) {
     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
+    case SERVICE_CONTROL_POWEREVENT: return _T("POWEREVENT");\r
     default: return 0;\r
   }\r
 }\r
@@ -1567,6 +1569,15 @@ unsigned long WINAPI service_control_handler(unsigned long control, unsigned lon
       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
+    case SERVICE_CONTROL_POWEREVENT:\r
+      if (event != PBT_APMRESUMEAUTOMATIC) {\r
+        log_service_control(service->name, control, false);\r
+        return NO_ERROR;\r
+      }\r
+      log_service_control(service->name, control, true);\r
+      end_service((void *) service, false);\r
+      return NO_ERROR;\r
   }\r
 \r
   /* Unknown control */\r
@@ -1790,7 +1801,7 @@ void CALLBACK end_service(void *arg, unsigned char why) {
 \r
   /* Clean up. */\r
   if (exitcode == STILL_ACTIVE) exitcode = 0;\r
-  if (service->pid) kill_process_tree(service, service->pid, exitcode, service->pid);\r
+  if (service->pid && service->kill_process_tree) kill_process_tree(service, service->pid, exitcode, service->pid);\r
   service->pid = 0;\r
 \r
   /*\r