Don't fail to restart if the service is stopped.

[nssm.git] / io.cpp

diff --git a/io.cpp b/io.cpp
index 5efffe0..d18e31c 100644 (file)
--- a/io.cpp
+++ b/io.cpp
@@ -71,7 +71,7 @@ int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned lon
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, prefix, _T("get_createfile_parameters()"), 0);\r
     return 1;\r
   }\r
-  switch (expand_parameter(key, value, path, MAX_PATH, true, false)) {\r
+  switch (expand_parameter(key, value, path, PATH_LENGTH, true, false)) {\r
     case 0: if (! path[0]) return 0; break; /* OK. */\r
     default: return 2; /* Error. */\r
   }\r
@@ -165,10 +165,10 @@ static void rotated_filename(TCHAR *path, TCHAR *rotated, unsigned long rotated_
     GetSystemTime(st);\r
   }\r
 \r
-  TCHAR buffer[MAX_PATH];\r
+  TCHAR buffer[PATH_LENGTH];\r
   memmove(buffer, path, sizeof(buffer));\r
   TCHAR *ext = PathFindExtension(buffer);\r
-  TCHAR extension[MAX_PATH];\r
+  TCHAR extension[PATH_LENGTH];\r
   _sntprintf_s(extension, _countof(extension), _TRUNCATE, _T("-%04u%02u%02uT%02u%02u%02u.%03u%s"), st->wYear, st->wMonth, st->wDay, st->wHour, st->wMinute, st->wSecond, st->wMilliseconds, ext);\r
   *ext = _T('\0');\r
   _sntprintf_s(rotated, rotated_len, _TRUNCATE, _T("%s%s"), buffer, extension);\r
@@ -227,7 +227,7 @@ void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsign
   /* Get new filename. */\r
   FileTimeToSystemTime(&info.ftLastWriteTime, &st);\r
 \r
-  TCHAR rotated[MAX_PATH];\r
+  TCHAR rotated[PATH_LENGTH];\r
   rotated_filename(path, rotated, _countof(rotated), &st);\r
 \r
   /* Rotate. */\r
@@ -276,18 +276,22 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
     HANDLE stdout_handle = append_to_file(service->stdout_path, service->stdout_sharing, 0, service->stdout_disposition, service->stdout_flags);\r
     if (! stdout_handle) return 4;\r
 \r
-    /* Try online rotation only if a size threshold is set. */\r
     if (service->rotate_files && service->rotate_stdout_online) {\r
       service->stdout_pipe = si->hStdOutput = 0;\r
       service->stdout_thread = create_logging_thread(service->name, service->stdout_path, service->stdout_sharing, service->stdout_disposition, service->stdout_flags, &service->stdout_pipe, &si->hStdOutput, &stdout_handle, service->rotate_bytes_low, service->rotate_bytes_high, &service->stdout_tid, &service->rotate_stdout_online);\r
-\r
       if (! service->stdout_thread) {\r
-        if (! DuplicateHandle(GetCurrentProcess(), stdout_handle, GetCurrentProcess(), &si->hStdOutput, 0, true, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) {\r
-          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, error_string(GetLastError()), 0);\r
-          return 4;\r
-        }\r
-        service->rotate_stdout_online = NSSM_ROTATE_OFFLINE;\r
+        CloseHandle(service->stdout_pipe);\r
+        CloseHandle(si->hStdOutput);\r
+      }\r
+    }\r
+    else service->stdout_thread = 0;\r
+\r
+    if (! service->stdout_thread) {\r
+      if (! DuplicateHandle(GetCurrentProcess(), stdout_handle, GetCurrentProcess(), &si->hStdOutput, 0, true, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) {\r
+        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, _T("stdout"), error_string(GetLastError()), 0);\r
+        return 4;\r
       }\r
+      service->rotate_stdout_online = NSSM_ROTATE_OFFLINE;\r
     }\r
 \r
     set_flags = true;\r
@@ -310,7 +314,7 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
       if (si) {\r
         /* Two handles to the same file will create a race. */\r
         if (! DuplicateHandle(GetCurrentProcess(), si->hStdOutput, GetCurrentProcess(), &si->hStdError, 0, true, DUPLICATE_SAME_ACCESS)) {\r
-          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, error_string(GetLastError()), 0);\r
+          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, _T("stderr"), error_string(GetLastError()), 0);\r
           return 6;\r
         }\r
       }\r
@@ -323,14 +327,19 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
       if (service->rotate_files && service->rotate_stderr_online) {\r
         service->stderr_pipe = si->hStdError = 0;\r
         service->stderr_thread = create_logging_thread(service->name, service->stderr_path, service->stderr_sharing, service->stderr_disposition, service->stderr_flags, &service->stderr_pipe, &si->hStdError, &stderr_handle, service->rotate_bytes_low, service->rotate_bytes_high, &service->stderr_tid, &service->rotate_stderr_online);\r
-\r
         if (! service->stderr_thread) {\r
-          if (! DuplicateHandle(GetCurrentProcess(), stderr_handle, GetCurrentProcess(), &si->hStdError, 0, true, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) {\r
-            log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDERR, error_string(GetLastError()), 0);\r
-            return 7;\r
-          }\r
-          service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
+          CloseHandle(service->stderr_pipe);\r
+          CloseHandle(si->hStdError);\r
+        }\r
+      }\r
+      else service->stderr_thread = 0;\r
+\r
+      if (! service->stderr_thread) {\r
+        if (! DuplicateHandle(GetCurrentProcess(), stderr_handle, GetCurrentProcess(), &si->hStdError, 0, true, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) {\r
+          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDERR, _T("stderr"), error_string(GetLastError()), 0);\r
+          return 7;\r
         }\r
+        service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
       }\r
 \r
       set_flags = true;\r
@@ -390,8 +399,8 @@ static int try_read(logger_t *logger, void *address, unsigned long bufsize, unsi
   }\r
 \r
 complain_read:\r
-  /* Ignore the error if we've been requested to exit for rotation anyway. */\r
-  if (*logger->rotate_online == NSSM_ROTATE_ONLINE_ASAP) return ret;\r
+  /* Ignore the error if we've been requested to exit anyway. */\r
+  if (*logger->rotate_online != NSSM_ROTATE_ONLINE) return ret;\r
   if (! (*complained & COMPLAINED_READ)) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_READFILE_FAILED, logger->service_name, logger->path, error_string(error), 0);\r
   *complained |= COMPLAINED_READ;\r
   return ret;\r
@@ -498,7 +507,7 @@ unsigned long WINAPI log_and_rotate(void *arg) {
 \r
           /* Rotate. */\r
           *logger->rotate_online = NSSM_ROTATE_ONLINE;\r
-          TCHAR rotated[MAX_PATH];\r
+          TCHAR rotated[PATH_LENGTH];\r
           rotated_filename(logger->path, rotated, _countof(rotated), 0);\r
 \r
           /*\r