git://git.iain.cx/iain / nssm.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added more environment functions.
[nssm.git] / service.cpp
diff --git a/service.cpp b/service.cpp
index 51c3937..c920af8 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -18,6 +18,85 @@ typedef struct {
   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
@@ -1060,32 +1139,35 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
   unsigned long error;\r
   SERVICE_STATUS service_status;\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.  As far as we're\r
-        concerned the operation is a success.  We don't claim to offer a\r
-        fully-feature service control method; it's just a quick 'n' dirty\r
-        interface.\r
-\r
-        In the future we may identify and handle this situation properly.\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
@@ -1099,16 +1181,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
     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
@@ -1118,8 +1191,8 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
   }\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
@@ -1128,11 +1201,22 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
     }\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
@@ -1292,6 +1376,19 @@ TCHAR *service_control_text(unsigned long control) {
   }\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
+\r
 void log_service_control(TCHAR *service_name, unsigned long control, bool handled) {\r
   TCHAR *text = service_control_text(control);\r
   unsigned long event;\r
@@ -1362,7 +1459,8 @@ unsigned long WINAPI service_control_handler(unsigned long control, unsigned lon
         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
@@ -1378,8 +1476,8 @@ unsigned long WINAPI service_control_handler(unsigned long control, unsigned lon
 \r
     case NSSM_SERVICE_CONTROL_ROTATE:\r
       log_service_control(service->name, control, true);\r
-      if (service->rotate_stdout_online) service->rotate_stdout_online = NSSM_ROTATE_ONLINE_ASAP;\r
-      if (service->rotate_stdout_online) service->rotate_stderr_online = NSSM_ROTATE_ONLINE_ASAP;\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
@@ -1424,6 +1522,7 @@ int start_service(nssm_service_t *service) {
   bool inherit_handles = false;\r
   if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;\r
   unsigned long flags = service->priority & priority_mask();\r
+  if (service->stdin_pipe) flags |= DETACHED_PROCESS;\r
   if (service->affinity) flags |= CREATE_SUSPENDED;\r
 #ifdef UNICODE\r
   flags |= CREATE_UNICODE_ENVIRONMENT;\r
@@ -1444,7 +1543,7 @@ int start_service(nssm_service_t *service) {
 \r
   if (get_process_creation_time(service->process_handle, &service->creation_time)) ZeroMemory(&service->creation_time, sizeof(service->creation_time));\r
 \r
-  close_output_handles(&si, ! service->rotate_stdout_online, ! service->rotate_stderr_online);\r
+  close_output_handles(&si);\r
 \r
   if (service->affinity) {\r
     /*\r
@@ -1516,6 +1615,12 @@ int stop_service(nssm_service_t *service, unsigned long exitcode, bool graceful,
     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
@@ -1564,6 +1669,8 @@ void CALLBACK end_service(void *arg, unsigned char why) {
 \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
The Non-Sucking Service Manager