Tidy up French GUI.

[nssm.git] / service.cpp

diff --git a/service.cpp b/service.cpp
index c9f4700..dbac12b 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -83,10 +83,11 @@ static inline int service_control_response(unsigned long control, unsigned long
   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
+static inline int await_service_control_response(unsigned long control, SC_HANDLE service_handle, SERVICE_STATUS *service_status, unsigned long initial_status, unsigned long cutoff) {\r
   int tries = 0;\r
   unsigned long checkpoint = 0;\r
   unsigned long waithint = 0;\r
+  unsigned long waited = 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
@@ -96,13 +97,22 @@ static inline int await_service_control_response(unsigned long control, SC_HANDL
       checkpoint = service_status->dwCheckPoint;\r
       waithint = service_status->dwWaitHint;\r
       if (++tries > 10) tries = 10;\r
-      Sleep(50 * tries);\r
+      unsigned long wait = 50 * tries;\r
+      if (cutoff) {\r
+        if (waited > cutoff) return response;\r
+        waited += wait;\r
+      }\r
+      Sleep(wait);\r
     }\r
     else return response;\r
   }\r
   return -1;\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
+  return await_service_control_response(control, service_handle, service_status, initial_status, 0);\r
+}\r
+\r
 static inline void wait_for_hooks(nssm_service_t *service, bool notify) {\r
   SERVICE_STATUS_HANDLE status_handle;\r
   SERVICE_STATUS *status;\r
@@ -1350,7 +1360,7 @@ int edit_service(nssm_service_t *service, bool editing) {
 }\r
 \r
 /* Control a service. */\r
-int control_service(unsigned long control, int argc, TCHAR **argv) {\r
+int control_service(unsigned long control, int argc, TCHAR **argv, bool return_status) {\r
   if (argc < 1) return usage(1);\r
   TCHAR *service_name = argv[0];\r
   TCHAR canonical_name[SERVICE_NAME_LENGTH];\r
@@ -1358,6 +1368,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
   SC_HANDLE services = open_service_manager(SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE);\r
   if (! services) {\r
     print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);\r
+    if (return_status) return 0;\r
     return 2;\r
   }\r
 \r
@@ -1384,6 +1395,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
   SC_HANDLE service_handle = open_service(services, service_name, access, canonical_name, _countof(canonical_name));\r
   if (! service_handle) {\r
     CloseServiceHandle(services);\r
+    if (return_status) return 0;\r
     return 3;\r
   }\r
 \r
@@ -1407,11 +1419,21 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
     }\r
 \r
     if (ret) {\r
-      int response = await_service_control_response(control, service_handle, &service_status, initial_status);\r
+      unsigned long cutoff = 0;\r
+\r
+      /* If we manage the service, respect the throttle time. */\r
+      HKEY key = open_registry(service_name, 0, KEY_READ, false);\r
+      if (key) {\r
+        if (get_number(key, NSSM_REG_THROTTLE, &cutoff, false) != 1) cutoff = NSSM_RESET_THROTTLE_RESTART;\r
+        RegCloseKey(key);\r
+      }\r
+\r
+      int response = await_service_control_response(control, service_handle, &service_status, initial_status, cutoff);\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
+        if (return_status) return 0;\r
         return 1;\r
       }\r
       else _tprintf(_T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));\r
@@ -1420,6 +1442,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
     else {\r
       CloseServiceHandle(service_handle);\r
       _ftprintf(stderr, _T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));\r
+      if (return_status) return 0;\r
       return 1;\r
     }\r
   }\r
@@ -1434,10 +1457,12 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
 \r
     if (ret) {\r
       _tprintf(_T("%s\n"), service_status_text(service_status.dwCurrentState));\r
+      if (return_status) return service_status.dwCurrentState;\r
       return 0;\r
     }\r
     else {\r
       _ftprintf(stderr, _T("%s: %s\n"), canonical_name, error_string(error));\r
+      if (return_status) return 0;\r
       return 1;\r
     }\r
   }\r
@@ -1458,22 +1483,32 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
 \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
+        if (return_status) return 0;\r
         return 1;\r
       }\r
       else _tprintf(_T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));\r
+      if (return_status) return service_status.dwCurrentState;\r
       return 0;\r
     }\r
     else {\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
+        if (control == SERVICE_CONTROL_SHUTDOWN || control == SERVICE_CONTROL_STOP) {\r
+          if (return_status) return SERVICE_STOPPED;\r
+          return 0;\r
+        }\r
       }\r
+      if (return_status) return 0;\r
       return 1;\r
     }\r
   }\r
 }\r
 \r
+int control_service(unsigned long control, int argc, TCHAR **argv) {\r
+  return control_service(control, argc, argv, false);\r
+}\r
+\r
 /* Remove the service */\r
 int remove_service(nssm_service_t *service) {\r
   if (! service) return 1;\r
@@ -2041,6 +2076,9 @@ void CALLBACK end_service(void *arg, unsigned char why) {
   service->exit_count++;\r
   (void) nssm_hook(&hook_threads, service, NSSM_HOOK_EVENT_EXIT, NSSM_HOOK_ACTION_POST, NULL, NSSM_HOOK_DEADLINE, true);\r
 \r
+  /* Exit logging threads. */\r
+  cleanup_loggers(service);\r
+\r
   /*\r
     The why argument is true if our wait timed out or false otherwise.\r
     Our wait is infinite so why will never be true when called by the system.\r
@@ -2091,7 +2129,6 @@ void CALLBACK end_service(void *arg, unsigned char why) {
       log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_EXIT_UNCLEAN, service->name, code, exit_action_strings[action], 0);\r
       stop_service(service, exitcode, false, default_action);\r
       wait_for_hooks(service, false);\r
-      free_imports();\r
       nssm_exit(exitcode);\r
   }\r
 }\r