X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=service.cpp;h=f82b9bda7a9825be0621c4431af4622f0b97b210;hb=ce9eb5d4646a0e279eae2909a18fccb1197e15fb;hp=d44998ab3c9e79f64b4fe6950ec67112720f94d6;hpb=fb6318bf814fd7f3445de8c83b7620e1b6b3c197;p=nssm.git

diff --git a/service.cpp b/service.cpp
index d44998a..f82b9bd 100644
--- a/service.cpp
+++ b/service.cpp
@@ -11,9 +11,12 @@ char exe[EXE_LENGTH];
 char flags[CMD_LENGTH];
 char dir[MAX_PATH];
 bool stopping;
+bool allow_restart;
 unsigned long throttle_delay;
+unsigned long stop_method;
 HANDLE throttle_timer;
 LARGE_INTEGER throttle_duetime;
+FILETIME creation_time;
 
 static enum { NSSM_EXIT_RESTART, NSSM_EXIT_IGNORE, NSSM_EXIT_REALLY, NSSM_EXIT_UNCLEAN } exit_actions;
 static const char *exit_action_strings[] = { "Restart", "Ignore", "Exit", "Suicide", 0 };
@@ -39,7 +42,7 @@ SC_HANDLE open_service_manager() {
 
 /* About to install the service */
 int pre_install_service(int argc, char **argv) {
-  /* Show the dialogue box if we didn't give the */
+  /* Show the dialogue box if we didn't give the service name and path */
   if (argc < 2) return nssm_gui(IDD_INSTALL, argv[0]);
 
   /* Arguments are optional */
@@ -78,7 +81,7 @@ int pre_remove_service(int argc, char **argv) {
   /* Show dialogue box if we didn't pass service name and "confirm" */
   if (argc < 2) return nssm_gui(IDD_REMOVE, argv[0]);
   if (str_equiv(argv[1], "confirm")) return remove_service(argv[0]);
-  fprintf(stderr, "To remove a service without confirmation: nssm remove <servicename> confirm\n");
+  print_message(stderr, NSSM_MESSAGE_PRE_REMOVE_SERVICE);
   return 100;
 }
 
@@ -87,10 +90,10 @@ int install_service(char *name, char *exe, char *flags) {
   /* Open service manager */
   SC_HANDLE services = open_service_manager();
   if (! services) {
-    fprintf(stderr, "Error opening service manager!\n");
+    print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);
     return 2;
   }
-  
+
   /* Get path of this program */
   char path[MAX_PATH];
   GetModuleFileName(0, path, MAX_PATH);
@@ -99,11 +102,11 @@ int install_service(char *name, char *exe, char *flags) {
   char command[CMD_LENGTH];
   size_t pathlen = strlen(path);
   if (pathlen + 1 >= VALUE_LENGTH) {
-    fprintf(stderr, "The full path to " NSSM " is too long!\n");
+    print_message(stderr, NSSM_MESSAGE_PATH_TOO_LONG, NSSM);
     return 3;
   }
-  if (_snprintf(command, sizeof(command), "\"%s\"", path) < 0) {
-    fprintf(stderr, "Out of memory for ImagePath!\n");
+  if (_snprintf_s(command, sizeof(command), _TRUNCATE, "\"%s\"", path) < 0) {
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY_FOR_IMAGEPATH);
     return 4;
   }
 
@@ -118,14 +121,14 @@ int install_service(char *name, char *exe, char *flags) {
   /* Create the service */
   SC_HANDLE service = CreateService(services, name, name, SC_MANAGER_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, command, 0, 0, 0, 0, 0);
   if (! service) {
-    fprintf(stderr, "Error creating service!\n");
+    print_message(stderr, NSSM_MESSAGE_CREATESERVICE_FAILED);
     CloseServiceHandle(services);
     return 5;
   }
 
   /* Now we need to put the parameters into the registry */
   if (create_parameters(name, exe, flags, dir)) {
-    fprintf(stderr, "Error setting startup parameters for the service!\n");
+    print_message(stderr, NSSM_MESSAGE_CREATE_PARAMETERS_FAILED);
     DeleteService(service);
     CloseServiceHandle(services);
     return 6;
@@ -137,7 +140,7 @@ int install_service(char *name, char *exe, char *flags) {
   CloseServiceHandle(service);
   CloseServiceHandle(services);
 
-  printf("Service \"%s\" installed successfully!\n", name);
+  print_message(stdout, NSSM_MESSAGE_SERVICE_INSTALLED, name);
   return 0;
 }
 
@@ -146,21 +149,21 @@ int remove_service(char *name) {
   /* Open service manager */
   SC_HANDLE services = open_service_manager();
   if (! services) {
-    fprintf(stderr, "Error opening service manager!\n");
+    print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);
     return 2;
   }
-  
+
   /* Try to open the service */
   SC_HANDLE service = OpenService(services, name, SC_MANAGER_ALL_ACCESS);
   if (! service) {
-    fprintf(stderr, "Can't open service!");
+    print_message(stderr, NSSM_MESSAGE_OPENSERVICE_FAILED);
     CloseServiceHandle(services);
     return 3;
   }
 
   /* Try to delete the service */
   if (! DeleteService(service)) {
-    fprintf(stderr, "Error deleting service!\n");
+    print_message(stderr, NSSM_MESSAGE_DELETESERVICE_FAILED);
     CloseServiceHandle(service);
     CloseServiceHandle(services);
     return 4;
@@ -170,13 +173,13 @@ int remove_service(char *name) {
   CloseServiceHandle(service);
   CloseServiceHandle(services);
 
-  printf("Service \"%s\" removed successfully!\n", name);
+  print_message(stdout, NSSM_MESSAGE_SERVICE_REMOVED, name);
   return 0;
 }
 
 /* Service initialisation */
 void WINAPI service_main(unsigned long argc, char **argv) {
-  if (_snprintf(service_name, sizeof(service_name), "%s", argv[0]) < 0) {
+  if (_snprintf_s(service_name, sizeof(service_name), _TRUNCATE, "%s", argv[0]) < 0) {
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "service_name", "service_main()", 0);
     return;
   }
@@ -259,7 +262,7 @@ int monitor_service() {
   int ret = start_service();
   if (ret) {
     char code[16];
-    _snprintf(code, sizeof(code), "%d", ret);
+    _snprintf_s(code, sizeof(code), _TRUNCATE, "%d", ret);
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_START_SERVICE_FAILED, exe, service_name, ret, 0);
     return ret;
   }
@@ -297,7 +300,7 @@ void log_service_control(char *service_name, unsigned long control, bool handled
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "control code", "log_service_control", 0);
       return;
     }
-    if (_snprintf(text, 11, "0x%08x", control) < 0) {
+    if (_snprintf_s(text, 11, _TRUNCATE, "0x%08x", control) < 0) {
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "control code", "log_service_control", 0);
       HeapFree(GetProcessHeap(), 0, text);
       return;
@@ -318,6 +321,10 @@ void log_service_control(char *service_name, unsigned long control, bool handled
 /* Service control handler */
 unsigned long WINAPI service_control_handler(unsigned long control, unsigned long event, void *data, void *context) {
   switch (control) {
+    case SERVICE_CONTROL_INTERROGATE:
+      /* We always keep the service status up-to-date so this is a no-op. */
+      return NO_ERROR;
+
     case SERVICE_CONTROL_SHUTDOWN:
     case SERVICE_CONTROL_STOP:
       log_service_control(service_name, control, true);
@@ -353,6 +360,7 @@ unsigned long WINAPI service_control_handler(unsigned long control, unsigned lon
 /* Start the service */
 int start_service() {
   stopping = false;
+  allow_restart = true;
 
   if (process_handle) return 0;
 
@@ -367,7 +375,7 @@ int start_service() {
 
   /* Get startup parameters */
   char *env = 0;
-  int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir), &env, &throttle_delay);
+  int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir), &env, &throttle_delay, &stop_method, &si);
   if (ret) {
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_PARAMETERS_FAILED, service_name, 0);
     return stop_service(2, true, true);
@@ -375,34 +383,45 @@ int start_service() {
 
   /* Launch executable with arguments */
   char cmd[CMD_LENGTH];
-  if (_snprintf(cmd, sizeof(cmd), "\"%s\" %s", exe, flags) < 0) {
+  if (_snprintf_s(cmd, sizeof(cmd), _TRUNCATE, "\"%s\" %s", exe, flags) < 0) {
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "command line", "start_service", 0);
+    close_output_handles(&si);
     return stop_service(2, true, true);
   }
 
   throttle_restart();
 
-  if (! CreateProcess(0, cmd, 0, 0, false, 0, env, dir, &si, &pi)) {
+  bool inherit_handles = false;
+  if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;
+  if (! CreateProcess(0, cmd, 0, 0, inherit_handles, 0, env, dir, &si, &pi)) {
     unsigned long error = GetLastError();
     if (error == ERROR_INVALID_PARAMETER && env) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED_INVALID_ENVIRONMENT, service_name, exe, NSSM_REG_ENV, 0);
     else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service_name, exe, error_string(error), 0);
+    close_output_handles(&si);
     return stop_service(3, true, true);
   }
   process_handle = pi.hProcess;
   pid = pi.dwProcessId;
 
-  /* Signal successful start */
-  service_status.dwCurrentState = SERVICE_RUNNING;
-  SetServiceStatus(service_handle, &service_status);
+  if (get_process_creation_time(process_handle, &creation_time)) ZeroMemory(&creation_time, sizeof(creation_time));
+
+  close_output_handles(&si);
 
   /* Wait for a clean startup. */
   if (WaitForSingleObject(process_handle, throttle_delay) == WAIT_TIMEOUT) throttle = 0;
 
+  /* Signal successful start */
+  service_status.dwCurrentState = SERVICE_RUNNING;
+  SetServiceStatus(service_handle, &service_status);
+
   return 0;
 }
 
 /* Stop the service */
 int stop_service(unsigned long exitcode, bool graceful, bool default_action) {
+  allow_restart = false;
+  if (wait_handle) UnregisterWait(wait_handle);
+
   if (default_action && ! exitcode && ! graceful) {
     log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_GRACEFUL_SUICIDE, service_name, 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);
     graceful = true;
@@ -415,12 +434,11 @@ int stop_service(unsigned long exitcode, bool graceful, bool default_action) {
     SetServiceStatus(service_handle, &service_status);
   }
 
-  /* Nothing to do if server isn't running */
+  /* Nothing to do if service isn't running */
   if (pid) {
-    /* Shut down server */
+    /* Shut down service */
     log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_TERMINATEPROCESS, service_name, exe, 0);
-    kill_process(service_name, process_handle, pid, 0);
-    process_handle = 0;
+    kill_process(service_name, stop_method, process_handle, pid, 0);
   }
   else log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_PROCESS_ALREADY_STOPPED, service_name, exe, 0);
 
@@ -453,10 +471,23 @@ void CALLBACK end_service(void *arg, unsigned char why) {
 
   /* Check exit code */
   unsigned long exitcode = 0;
+  char code[16];
+  FILETIME exit_time;
   GetExitCodeProcess(process_handle, &exitcode);
+  if (exitcode == STILL_ACTIVE || get_process_exit_time(process_handle, &exit_time)) GetSystemTimeAsFileTime(&exit_time);
+  CloseHandle(process_handle);
+
+  /*
+    Log that the service ended BEFORE logging about killing the process
+    tree.  See below for the possible values of the why argument.
+  */
+  if (! why) {
+    _snprintf_s(code, sizeof(code), _TRUNCATE, "%d", exitcode);
+    log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_ENDED_SERVICE, exe, service_name, code, 0);
+  }
 
   /* Clean up. */
-  kill_process_tree(service_name, pid, exitcode, pid);
+  kill_process_tree(service_name, stop_method, pid, exitcode, pid, &creation_time, &exit_time);
 
   /*
     The why argument is true if our wait timed out or false otherwise.
@@ -465,10 +496,7 @@ void CALLBACK end_service(void *arg, unsigned char why) {
     this is a controlled shutdown, and don't take any restart action.
   */
   if (why) return;
-
-  char code[16];
-  _snprintf(code, sizeof(code), "%d", exitcode);
-  log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_ENDED_SERVICE, exe, service_name, code, 0);
+  if (! allow_restart) return;
 
   /* What action should we take? */
   int action = NSSM_EXIT_RESTART;
@@ -524,8 +552,8 @@ void throttle_restart() {
   if (throttle > 7) throttle = 8;
 
   char threshold[8], milliseconds[8];
-  _snprintf(threshold, sizeof(threshold), "%d", throttle_delay);
-  _snprintf(milliseconds, sizeof(milliseconds), "%d", ms);
+  _snprintf_s(threshold, sizeof(threshold), _TRUNCATE, "%d", throttle_delay);
+  _snprintf_s(milliseconds, sizeof(milliseconds), _TRUNCATE, "%d", ms);
   log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_THROTTLED, service_name, threshold, milliseconds, 0);
 
   if (throttle_timer) {