X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=io.cpp;h=48611b09c57f4719e0d4f43d9f415afa60b0c3c5;hb=ee9a86c8408feaf173733aea12a80211e5d74483;hp=0fbc4e4d1b1ab37aaa7a2b3186c16e6a6521a4ec;hpb=777f0f5ebacf03d35a61dacdc9b74888fda9fb3e;p=nssm.git

diff --git a/io.cpp b/io.cpp
index 0fbc4e4..48611b0 100644
--- a/io.cpp
+++ b/io.cpp
@@ -4,9 +4,70 @@
 #define COMPLAINED_WRITE (1 << 1)
 #define COMPLAINED_ROTATE (1 << 2)
 
-static HANDLE create_logging_thread(logger_t *logger) {
+static int dup_handle(HANDLE source_handle, HANDLE *dest_handle_ptr, TCHAR *source_description, TCHAR *dest_description, unsigned long flags) {
+  if (! dest_handle_ptr) return 1;
+
+  if (! DuplicateHandle(GetCurrentProcess(), source_handle, GetCurrentProcess(), dest_handle_ptr, 0, true, flags)) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, source_description, dest_description, error_string(GetLastError()), 0);
+    return 2;
+  }
+  return 0;
+}
+
+static int dup_handle(HANDLE source_handle, HANDLE *dest_handle_ptr, TCHAR *source_description, TCHAR *dest_description) {
+  return dup_handle(source_handle, dest_handle_ptr, source_description, dest_description, DUPLICATE_SAME_ACCESS);
+}
+
+/*
+  read_handle:  read from application
+  pipe_handle:  stdout of application
+  write_handle: to file
+*/
+static HANDLE create_logging_thread(TCHAR *service_name, TCHAR *path, unsigned long sharing, unsigned long disposition, unsigned long flags, HANDLE *read_handle_ptr, HANDLE *pipe_handle_ptr, HANDLE *write_handle_ptr, unsigned long rotate_bytes_low, unsigned long rotate_bytes_high, unsigned long rotate_delay, unsigned long *tid_ptr, unsigned long *rotate_online, bool copy_and_truncate) {
+  *tid_ptr = 0;
+
+  /* Pipe between application's stdout/stderr and our logging handle. */
+  if (read_handle_ptr && ! *read_handle_ptr) {
+    if (pipe_handle_ptr && ! *pipe_handle_ptr) {
+      if (CreatePipe(read_handle_ptr, pipe_handle_ptr, 0, 0)) {
+        SetHandleInformation(*pipe_handle_ptr, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT);
+      }
+      else {
+        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPIPE_FAILED, service_name, path, error_string(GetLastError()));
+        return (HANDLE) 0;
+      }
+    }
+  }
+
+  logger_t *logger = (logger_t *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(logger_t));
+  if (! logger) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("logger"), _T("create_logging_thread()"), 0);
+    return (HANDLE) 0;
+  }
+
+  ULARGE_INTEGER size;
+  size.LowPart = rotate_bytes_low;
+  size.HighPart = rotate_bytes_high;
+
+  logger->service_name = service_name;
+  logger->path = path;
+  logger->sharing = sharing;
+  logger->disposition = disposition;
+  logger->flags = flags;
+  logger->read_handle = *read_handle_ptr;
+  logger->write_handle = *write_handle_ptr;
+  logger->size = (__int64) size.QuadPart;
+  logger->tid_ptr = tid_ptr;
+  logger->rotate_online = rotate_online;
+  logger->rotate_delay = rotate_delay;
+  logger->copy_and_truncate = copy_and_truncate;
+
   HANDLE thread_handle = CreateThread(NULL, 0, log_and_rotate, (void *) logger, 0, logger->tid_ptr);
-  if (! thread_handle) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATETHREAD_FAILED, error_string(GetLastError()), 0);
+  if (! thread_handle) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATETHREAD_FAILED, error_string(GetLastError()), 0);
+    HeapFree(GetProcessHeap(), 0, logger);
+  }
+
   return thread_handle;
 }
 
@@ -22,8 +83,21 @@ static inline void write_bom(logger_t *logger, unsigned long *out) {
   }
 }
 
+void close_handle(HANDLE *handle, HANDLE *remember) {
+  if (remember) *remember = INVALID_HANDLE_VALUE;
+  if (! handle) return;
+  if (! *handle) return;
+  CloseHandle(*handle);
+  if (remember) *remember = *handle;
+  *handle = 0;
+}
+
+void close_handle(HANDLE *handle) {
+  close_handle(handle, NULL);
+}
+
 /* Get path, share mode, creation disposition and flags for a stream. */
-int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned long *sharing, unsigned long default_sharing, unsigned long *disposition, unsigned long default_disposition, unsigned long *flags, unsigned long default_flags) {
+int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned long *sharing, unsigned long default_sharing, unsigned long *disposition, unsigned long default_disposition, unsigned long *flags, unsigned long default_flags, bool *copy_and_truncate) {
   TCHAR value[NSSM_STDIO_LENGTH];
 
   /* Path. */
@@ -31,7 +105,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);
     return 1;
   }
-  switch (expand_parameter(key, value, path, MAX_PATH, true, false)) {
+  switch (expand_parameter(key, value, path, PATH_LENGTH, true, false)) {
     case 0: if (! path[0]) return 0; break; /* OK. */
     default: return 2; /* Error. */
   }
@@ -44,7 +118,7 @@ int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned lon
   switch (get_number(key, value, sharing, false)) {
     case 0: *sharing = default_sharing; break; /* Missing. */
     case 1: break; /* Found. */
-    case -2: return 4; break; /* Error. */
+    case -2: return 4; /* Error. */
   }
 
   /* CreationDisposition. */
@@ -55,7 +129,7 @@ int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned lon
   switch (get_number(key, value, disposition, false)) {
     case 0: *disposition = default_disposition; break; /* Missing. */
     case 1: break; /* Found. */
-    case -2: return 6; break; /* Error. */
+    case -2: return 6; /* Error. */
   }
 
   /* Flags. */
@@ -66,7 +140,24 @@ int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned lon
   switch (get_number(key, value, flags, false)) {
     case 0: *flags = default_flags; break; /* Missing. */
     case 1: break; /* Found. */
-    case -2: return 8; break; /* Error. */
+    case -2: return 8; /* Error. */
+  }
+
+  /* Rotate with CopyFile() and SetEndOfFile(). */
+  if (copy_and_truncate) {
+    unsigned long data;
+    if (_sntprintf_s(value, _countof(value), _TRUNCATE, _T("%s%s"), prefix, NSSM_REG_STDIO_COPY_AND_TRUNCATE) < 0) {
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, NSSM_REG_STDIO_COPY_AND_TRUNCATE, _T("get_createfile_parameters()"), 0);
+      return 9;
+    }
+    switch (get_number(key, value, &data, false)) {
+      case 0: *copy_and_truncate = false; break; /* Missing. */
+      case 1: /* Found. */
+        if (data) *copy_and_truncate = true;
+        else *copy_and_truncate = false;
+        break;
+      case -2: return 9; /* Error. */
+    }
   }
 
   return 0;
@@ -95,24 +186,16 @@ int delete_createfile_parameter(HKEY key, TCHAR *prefix, TCHAR *suffix) {
   return 1;
 }
 
-HANDLE append_to_file(TCHAR *path, unsigned long sharing, SECURITY_ATTRIBUTES *attributes, unsigned long disposition, unsigned long flags) {
-  HANDLE ret;
-
-  /* Try to append to the file first. */
-  ret = CreateFile(path, FILE_APPEND_DATA, sharing, attributes, disposition, flags, 0);
-  if (ret) {
-    SetEndOfFile(ret);
+HANDLE write_to_file(TCHAR *path, unsigned long sharing, SECURITY_ATTRIBUTES *attributes, unsigned long disposition, unsigned long flags) {
+  static LARGE_INTEGER offset = { 0 };
+  HANDLE ret = CreateFile(path, FILE_WRITE_DATA, sharing, attributes, disposition, flags, 0);
+  if (ret != INVALID_HANDLE_VALUE) {
+    if (SetFilePointerEx(ret, offset, 0, FILE_END)) SetEndOfFile(ret);
     return ret;
   }
 
-  unsigned long error = GetLastError();
-  if (error != ERROR_FILE_NOT_FOUND) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, path, error_string(error), 0);
-    return (HANDLE) 0;
-  }
-
-  /* It didn't exist.  Create it. */
-  return CreateFile(path, FILE_WRITE_DATA, sharing, attributes, disposition, flags, 0);
+  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, path, error_string(GetLastError()), 0);
+  return ret;
 }
 
 static void rotated_filename(TCHAR *path, TCHAR *rotated, unsigned long rotated_len, SYSTEMTIME *st) {
@@ -122,16 +205,16 @@ static void rotated_filename(TCHAR *path, TCHAR *rotated, unsigned long rotated_
     GetSystemTime(st);
   }
 
-  TCHAR buffer[MAX_PATH];
+  TCHAR buffer[PATH_LENGTH];
   memmove(buffer, path, sizeof(buffer));
   TCHAR *ext = PathFindExtension(buffer);
-  TCHAR extension[MAX_PATH];
+  TCHAR extension[PATH_LENGTH];
   _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);
   *ext = _T('\0');
   _sntprintf_s(rotated, rotated_len, _TRUNCATE, _T("%s%s"), buffer, extension);
 }
 
-void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsigned long low, unsigned long high) {
+void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsigned long delay, unsigned long low, unsigned long high, bool copy_and_truncate) {
   unsigned long error;
 
   /* Now. */
@@ -142,7 +225,7 @@ void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsign
 
   /* Try to open the file to check if it exists and to get attributes. */
   HANDLE file = CreateFile(path, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-  if (file) {
+  if (file != INVALID_HANDLE_VALUE) {
     /* Get file attributes. */
     if (! GetFileInformationByHandle(file, &info)) {
       /* Reuse current time for rotation timestamp. */
@@ -184,210 +267,183 @@ void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsign
   /* Get new filename. */
   FileTimeToSystemTime(&info.ftLastWriteTime, &st);
 
-  TCHAR rotated[MAX_PATH];
+  TCHAR rotated[PATH_LENGTH];
   rotated_filename(path, rotated, _countof(rotated), &st);
 
   /* Rotate. */
-  if (MoveFile(path, rotated)) {
+  bool ok = true;
+  TCHAR *function;
+  if (copy_and_truncate) {
+    function = _T("CopyFile()");
+    if (CopyFile(path, rotated, TRUE)) {
+      file = write_to_file(path, NSSM_STDOUT_SHARING, 0, NSSM_STDOUT_DISPOSITION, NSSM_STDOUT_FLAGS);
+      Sleep(delay);
+      SetFilePointer(file, 0, 0, FILE_BEGIN);
+      SetEndOfFile(file);
+      CloseHandle(file);
+    }
+    else ok = false;
+  }
+  else {
+    function = _T("MoveFile()");
+    if (! MoveFile(path, rotated)) ok = false;
+  }
+  if (ok) {
     log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_ROTATED, service_name, path, rotated, 0);
     return;
   }
   error = GetLastError();
 
   if (error == ERROR_FILE_NOT_FOUND) return;
-  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_ROTATE_FILE_FAILED, service_name, path, _T("MoveFile()"), rotated, error_string(error), 0);
+  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_ROTATE_FILE_FAILED, service_name, path, function, rotated, error_string(error), 0);
   return;
 }
 
-int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
-  bool set_flags = false;
+int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
+  if (! si) return 1;
 
-  /* Standard security attributes allowing inheritance. */
-  SECURITY_ATTRIBUTES attributes;
-  ZeroMemory(&attributes, sizeof(attributes));
-  attributes.bInheritHandle = true;
+  /* Allocate a new console so we get a fresh stdin, stdout and stderr. */
+  alloc_console(service);
 
   /* stdin */
-  if (get_createfile_parameters(key, NSSM_REG_STDIN, service->stdin_path, &service->stdin_sharing, NSSM_STDIN_SHARING, &service->stdin_disposition, NSSM_STDIN_DISPOSITION, &service->stdin_flags, NSSM_STDIN_FLAGS)) {
-    service->stdin_sharing = service->stdin_disposition = service->stdin_flags = 0;
-    ZeroMemory(service->stdin_path, _countof(service->stdin_path) * sizeof(TCHAR));
-    return 1;
-  }
-  if (si && service->stdin_path[0]) {
-    si->hStdInput = CreateFile(service->stdin_path, FILE_READ_DATA, service->stdin_sharing, &attributes, service->stdin_disposition, service->stdin_flags, 0);
-    if (! si->hStdInput) {
+  if (service->stdin_path[0]) {
+    si->hStdInput = CreateFile(service->stdin_path, FILE_READ_DATA, service->stdin_sharing, 0, service->stdin_disposition, service->stdin_flags, 0);
+    if (si->hStdInput == INVALID_HANDLE_VALUE) {
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, service->stdin_path, error_string(GetLastError()), 0);
       return 2;
     }
-    set_flags = true;
   }
 
-  ULARGE_INTEGER size;
-  size.LowPart = service->rotate_bytes_low;
-  size.HighPart = service->rotate_bytes_high;
-
   /* stdout */
-  if (get_createfile_parameters(key, NSSM_REG_STDOUT, service->stdout_path, &service->stdout_sharing, NSSM_STDOUT_SHARING, &service->stdout_disposition, NSSM_STDOUT_DISPOSITION, &service->stdout_flags, NSSM_STDOUT_FLAGS)) {
-    service->stdout_sharing = service->stdout_disposition = service->stdout_flags = 0;
-    ZeroMemory(service->stdout_path, _countof(service->stdout_path) * sizeof(TCHAR));
-    return 3;
-  }
-  if (si && service->stdout_path[0]) {
-    if (service->rotate_files) rotate_file(service->name, service->stdout_path, service->rotate_seconds, service->rotate_bytes_low, service->rotate_bytes_high);
-    HANDLE stdout_handle = append_to_file(service->stdout_path, service->stdout_sharing, 0, service->stdout_disposition, service->stdout_flags);
-    if (! stdout_handle) {
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, service->stdout_path, error_string(GetLastError()), 0);
-      return 4;
-    }
-
-    /* Try online rotation only if a size threshold is set. */
-    logger_t *stdout_logger = 0;
-    if (service->rotate_files && service->rotate_stdout_online && size.QuadPart) {
-      stdout_logger = (logger_t *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(logger_t));
-      if (stdout_logger) {
-        /* Pipe between application's stdout and our logging handle. */
-        if (CreatePipe(&service->stdout_pipe, &si->hStdOutput, &attributes, 0)) {
-          stdout_logger->service_name = service->name;
-          stdout_logger->path = service->stdout_path;
-          stdout_logger->sharing = service->stdout_sharing;
-          stdout_logger->disposition = service->stdout_disposition;
-          stdout_logger->flags = service->stdout_flags;
-          stdout_logger->read_handle = service->stdout_pipe;
-          stdout_logger->write_handle = stdout_handle;
-          stdout_logger->size = (__int64) size.QuadPart;
-          stdout_logger->tid_ptr = &service->stdout_tid;
-
-          /* Logging thread. */
-          service->stdout_thread = create_logging_thread(stdout_logger);
-          if (! service->stdout_thread) {
-            log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPIPE_FAILED, service->name, service->stdout_path, error_string(GetLastError()));
-            CloseHandle(service->stdout_pipe);
-            CloseHandle(si->hStdOutput);
-            service->stdout_tid = 0;
-          }
-        }
-        else service->stdout_tid = 0;
+  if (service->stdout_path[0]) {
+    if (service->rotate_files) rotate_file(service->name, service->stdout_path, service->rotate_seconds, service->rotate_bytes_low, service->rotate_bytes_high, service->rotate_delay, service->stdout_copy_and_truncate);
+    HANDLE stdout_handle = write_to_file(service->stdout_path, service->stdout_sharing, 0, service->stdout_disposition, service->stdout_flags);
+    if (stdout_handle == INVALID_HANDLE_VALUE) return 4;
+    service->stdout_si = 0;
+
+    if (service->use_stdout_pipe) {
+      service->stdout_pipe = si->hStdOutput = 0;
+      service->stdout_thread = create_logging_thread(service->name, service->stdout_path, service->stdout_sharing, service->stdout_disposition, service->stdout_flags, &service->stdout_pipe, &service->stdout_si, &stdout_handle, service->rotate_bytes_low, service->rotate_bytes_high, service->rotate_delay, &service->stdout_tid, &service->rotate_stdout_online, service->stdout_copy_and_truncate);
+      if (! service->stdout_thread) {
+        CloseHandle(service->stdout_pipe);
+        CloseHandle(service->stdout_si);
       }
-      else {
-        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("stdout_logger"), _T("get_output_handles()"), 0);
-        service->stdout_tid = 0;
-      }
-
-      /* Fall through to try direct I/O. */
-      if (! service->stdout_tid) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPIPE_FAILED, service->name, service->stdout_path, error_string(GetLastError()));
     }
+    else service->stdout_thread = 0;
 
-    if (! service->stdout_tid) {
-      if (stdout_logger) HeapFree(GetProcessHeap(), 0, stdout_logger);
-      if (! DuplicateHandle(GetCurrentProcess(), stdout_handle, GetCurrentProcess(), &si->hStdOutput, 0, true, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) {
-        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, error_string(GetLastError()), 0);
-        return 4;
-      }
-      service->rotate_stdout_online = false;
+    if (! service->stdout_thread) {
+      if (dup_handle(stdout_handle, &service->stdout_si, NSSM_REG_STDOUT, _T("stdout"), DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) return 4;
+      service->rotate_stdout_online = NSSM_ROTATE_OFFLINE;
     }
 
-    set_flags = true;
+    if (dup_handle(service->stdout_si, &si->hStdOutput, _T("stdout_si"), _T("stdout"))) close_handle(&service->stdout_thread);
   }
 
   /* stderr */
-  if (get_createfile_parameters(key, NSSM_REG_STDERR, service->stderr_path, &service->stdout_sharing, NSSM_STDERR_SHARING, &service->stdout_disposition, NSSM_STDERR_DISPOSITION, &service->stdout_flags, NSSM_STDERR_FLAGS)) {
-    service->stderr_sharing = service->stderr_disposition = service->stderr_flags = 0;
-    ZeroMemory(service->stderr_path, _countof(service->stderr_path) * sizeof(TCHAR));
-    return 5;
-  }
   if (service->stderr_path[0]) {
     /* Same as stdout? */
     if (str_equiv(service->stderr_path, service->stdout_path)) {
       service->stderr_sharing = service->stdout_sharing;
       service->stderr_disposition = service->stdout_disposition;
       service->stderr_flags = service->stdout_flags;
-      service->rotate_stderr_online = false;
+      service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;
 
-      if (si) {
-        /* Two handles to the same file will create a race. */
-        if (! DuplicateHandle(GetCurrentProcess(), si->hStdOutput, GetCurrentProcess(), &si->hStdError, 0, true, DUPLICATE_SAME_ACCESS)) {
-          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, error_string(GetLastError()), 0);
-          return 6;
-        }
-      }
+      /* Two handles to the same file will create a race. */
+      /* XXX: Here we assume that either both or neither handle must be a pipe. */
+      if (dup_handle(service->stdout_si, &service->stderr_si, _T("stdout"), _T("stderr"))) return 6;
     }
-    else if (si) {
-      if (service->rotate_files) rotate_file(service->name, service->stderr_path, service->rotate_seconds, service->rotate_bytes_low, service->rotate_bytes_high);
-      HANDLE stderr_handle = append_to_file(service->stderr_path, service->stdout_sharing, 0, service->stdout_disposition, service->stdout_flags);
-      if (! stderr_handle) {
-        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, service->stderr_path, error_string(GetLastError()), 0);
-        return 7;
-      }
-
-      /* Try online rotation only if a size threshold is set. */
-      logger_t *stderr_logger = 0;
-      if (service->rotate_files && service->rotate_stderr_online && size.QuadPart) {
-        stderr_logger = (logger_t *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(logger_t));
-        if (stderr_logger) {
-          /* Pipe between application's stderr and our logging handle. */
-          if (CreatePipe(&service->stderr_pipe, &si->hStdError, &attributes, 0)) {
-            stderr_logger->service_name = service->name;
-            stderr_logger->path = service->stderr_path;
-            stderr_logger->sharing = service->stderr_sharing;
-            stderr_logger->disposition = service->stderr_disposition;
-            stderr_logger->flags = service->stderr_flags;
-            stderr_logger->read_handle = service->stderr_pipe;
-            stderr_logger->write_handle = stderr_handle;
-            stderr_logger->size = (__int64) size.QuadPart;
-            stderr_logger->tid_ptr = &service->stderr_tid;
-
-            /* Logging thread. */
-            service->stderr_thread = create_logging_thread(stderr_logger);
-            if (! service->stderr_thread) {
-              log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPIPE_FAILED, service->name, service->stderr_path, error_string(GetLastError()));
-              CloseHandle(service->stderr_pipe);
-              CloseHandle(si->hStdError);
-              service->stderr_tid = 0;
-            }
-          }
-          else service->stderr_tid = 0;
+    else {
+      if (service->rotate_files) rotate_file(service->name, service->stderr_path, service->rotate_seconds, service->rotate_bytes_low, service->rotate_bytes_high, service->rotate_delay, service->stderr_copy_and_truncate);
+      HANDLE stderr_handle = write_to_file(service->stderr_path, service->stderr_sharing, 0, service->stderr_disposition, service->stderr_flags);
+      if (stderr_handle == INVALID_HANDLE_VALUE) return 7;
+      service->stderr_si = 0;
+
+      if (service->use_stderr_pipe) {
+        service->stderr_pipe = si->hStdError = 0;
+        service->stderr_thread = create_logging_thread(service->name, service->stderr_path, service->stderr_sharing, service->stderr_disposition, service->stderr_flags, &service->stderr_pipe, &service->stderr_si, &stderr_handle, service->rotate_bytes_low, service->rotate_bytes_high, service->rotate_delay, &service->stderr_tid, &service->rotate_stderr_online, service->stderr_copy_and_truncate);
+        if (! service->stderr_thread) {
+          CloseHandle(service->stderr_pipe);
+          CloseHandle(service->stderr_si);
         }
-        else {
-          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("stderr_logger"), _T("get_output_handles()"), 0);
-          service->stderr_tid = 0;
-        }
-
-        /* Fall through to try direct I/O. */
-        if (! service->stderr_tid) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPIPE_FAILED, service->name, service->stderr_path, error_string(GetLastError()));
       }
+      else service->stderr_thread = 0;
 
-      if (! service->stderr_tid) {
-        if (stderr_logger) HeapFree(GetProcessHeap(), 0, stderr_logger);
-        if (! DuplicateHandle(GetCurrentProcess(), stderr_handle, GetCurrentProcess(), &si->hStdError, 0, true, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) {
-          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDERR, error_string(GetLastError()), 0);
-          return 7;
-        }
-        service->rotate_stderr_online = false;
+      if (! service->stderr_thread) {
+        if (dup_handle(stderr_handle, &service->stderr_si, NSSM_REG_STDERR, _T("stderr"), DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) return 7;
+        service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;
       }
     }
 
-    set_flags = true;
+    if (dup_handle(service->stderr_si, &si->hStdError, _T("stderr_si"), _T("stderr"))) close_handle(&service->stderr_thread);
   }
 
-  if (! set_flags) return 0;
-
   /*
     We need to set the startup_info flags to make the new handles
     inheritable by the new process.
   */
-  if (si) si->dwFlags |= STARTF_USESTDHANDLES;
+  si->dwFlags |= STARTF_USESTDHANDLES;
+
+  if (service->no_console) return 0;
+
+  /* Redirect other handles. */
+  if (! si->hStdInput) {
+    if (dup_handle(GetStdHandle(STD_INPUT_HANDLE), &si->hStdInput, _T("STD_INPUT_HANDLE"), _T("stdin"))) return 8;
+  }
+  if (! si->hStdOutput) {
+    if (dup_handle(GetStdHandle(STD_OUTPUT_HANDLE), &si->hStdOutput, _T("STD_OUTPUT_HANDLE"), _T("stdout"))) return 9;
+  }
+  if (! si->hStdError)  {
+    if (dup_handle(GetStdHandle(STD_ERROR_HANDLE), &si->hStdError, _T("STD_ERROR_HANDLE"), _T("stderr"))) return 10;
+  }
 
   return 0;
 }
 
-void close_output_handles(STARTUPINFO *si, bool close_stdout, bool close_stderr) {
-  if (si->hStdInput) CloseHandle(si->hStdInput);
-  if (si->hStdOutput && close_stdout) CloseHandle(si->hStdOutput);
-  if (si->hStdError && close_stderr) CloseHandle(si->hStdError);
+/* Reuse output handles for a hook. */
+int use_output_handles(nssm_service_t *service, STARTUPINFO *si) {
+  si->dwFlags &= ~STARTF_USESTDHANDLES;
+
+  if (service->stdout_si) {
+    if (dup_handle(service->stdout_si, &si->hStdOutput, _T("stdout_pipe"), _T("hStdOutput"))) return 1;
+    si->dwFlags |= STARTF_USESTDHANDLES;
+  }
+
+  if (service->stderr_si) {
+    if (dup_handle(service->stderr_si, &si->hStdError, _T("stderr_pipe"), _T("hStdError"))) {
+      if (si->hStdOutput) {
+        si->dwFlags &= ~STARTF_USESTDHANDLES;
+        CloseHandle(si->hStdOutput);
+      }
+      return 2;
+    }
+    si->dwFlags |= STARTF_USESTDHANDLES;
+  }
+
+  return 0;
 }
 
 void close_output_handles(STARTUPINFO *si) {
-  return close_output_handles(si, true, true);
+  if (si->hStdInput) CloseHandle(si->hStdInput);
+  if (si->hStdOutput) CloseHandle(si->hStdOutput);
+  if (si->hStdError) CloseHandle(si->hStdError);
+}
+
+void cleanup_loggers(nssm_service_t *service) {
+  unsigned long interval = NSSM_CLEANUP_LOGGERS_DEADLINE;
+  HANDLE thread_handle = INVALID_HANDLE_VALUE;
+
+  close_handle(&service->stdout_thread, &thread_handle);
+  /* Close write end of the data pipe so logging thread can finalise read. */
+  close_handle(&service->stdout_si);
+  /* Await logging thread then close read end. */
+  if (thread_handle != INVALID_HANDLE_VALUE) WaitForSingleObject(thread_handle, interval);
+  close_handle(&service->stdout_pipe);
+
+  thread_handle = INVALID_HANDLE_VALUE;
+  close_handle(&service->stderr_thread, &thread_handle);
+  close_handle(&service->stderr_si);
+  if (thread_handle != INVALID_HANDLE_VALUE) WaitForSingleObject(thread_handle, interval);
+  close_handle(&service->stderr_pipe);
 }
 
 /*
@@ -426,6 +482,8 @@ static int try_read(logger_t *logger, void *address, unsigned long bufsize, unsi
   }
 
 complain_read:
+  /* Ignore the error if we've been requested to exit anyway. */
+  if (*logger->rotate_online != NSSM_ROTATE_ONLINE) return ret;
   if (! (*complained & COMPLAINED_READ)) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_READFILE_FAILED, logger->service_name, logger->path, error_string(error), 0);
   *complained |= COMPLAINED_READ;
   return ret;
@@ -505,12 +563,14 @@ unsigned long WINAPI log_and_rotate(void *arg) {
     address = &buffer;
     ret = try_read(logger, address, sizeof(buffer), &in, &complained);
     if (ret < 0) {
+      close_handle(&logger->read_handle);
+      close_handle(&logger->write_handle);
       HeapFree(GetProcessHeap(), 0, logger);
       return 2;
     }
     else if (ret) continue;
 
-    if (size + (__int64) in >= logger->size) {
+    if (*logger->rotate_online == NSSM_ROTATE_ONLINE_ASAP || (logger->size && size + (__int64) in >= logger->size)) {
       /* Look for newline. */
       unsigned long i;
       for (i = 0; i < in; i++) {
@@ -521,13 +581,16 @@ unsigned long WINAPI log_and_rotate(void *arg) {
           /* Write up to the newline. */
           ret = try_write(logger, address, i, &out, &complained);
           if (ret < 0) {
+            close_handle(&logger->read_handle);
+            close_handle(&logger->write_handle);
             HeapFree(GetProcessHeap(), 0, logger);
             return 3;
           }
           size += (__int64) out;
 
           /* Rotate. */
-          TCHAR rotated[MAX_PATH];
+          *logger->rotate_online = NSSM_ROTATE_ONLINE;
+          TCHAR rotated[PATH_LENGTH];
           rotated_filename(logger->path, rotated, _countof(rotated), 0);
 
           /*
@@ -535,15 +598,33 @@ unsigned long WINAPI log_and_rotate(void *arg) {
             MoveFile() will fail if the handle is still open so we must
             risk losing everything.
           */
-          CloseHandle(logger->write_handle);
-          if (MoveFile(logger->path, rotated)) {
+          if (logger->copy_and_truncate) FlushFileBuffers(logger->write_handle);
+          close_handle(&logger->write_handle);
+          bool ok = true;
+          TCHAR *function;
+          if (logger->copy_and_truncate) {
+            function = _T("CopyFile()");
+            if (CopyFile(logger->path, rotated, TRUE)) {
+              HANDLE file = write_to_file(logger->path, NSSM_STDOUT_SHARING, 0, NSSM_STDOUT_DISPOSITION, NSSM_STDOUT_FLAGS);
+              Sleep(logger->rotate_delay);
+              SetFilePointer(file, 0, 0, FILE_BEGIN);
+              SetEndOfFile(file);
+              CloseHandle(file);
+            }
+            else ok = false;
+          }
+          else {
+            function = _T("MoveFile()");
+            if (! MoveFile(logger->path, rotated)) ok = false;
+          }
+          if (ok) {
             log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_ROTATED, logger->service_name, logger->path, rotated, 0);
             size = 0LL;
           }
           else {
             error = GetLastError();
             if (error != ERROR_FILE_NOT_FOUND) {
-              if (! (complained & COMPLAINED_ROTATE)) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_ROTATE_FILE_FAILED, logger->service_name, logger->path, _T("MoveFile()"), rotated, error_string(error), 0);
+              if (! (complained & COMPLAINED_ROTATE)) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_ROTATE_FILE_FAILED, logger->service_name, logger->path, function, rotated, error_string(error), 0);
               complained |= COMPLAINED_ROTATE;
               /* We can at least try to re-open the existing file. */
               logger->disposition = OPEN_ALWAYS;
@@ -551,11 +632,13 @@ unsigned long WINAPI log_and_rotate(void *arg) {
           }
 
           /* Reopen. */
-          logger->write_handle = append_to_file(logger->path, logger->sharing, 0, logger->disposition, logger->flags);
-          if (! logger->write_handle) {
+          logger->write_handle = write_to_file(logger->path, logger->sharing, 0, logger->disposition, logger->flags);
+          if (logger->write_handle == INVALID_HANDLE_VALUE) {
             error = GetLastError();
             log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, logger->path, error_string(error), 0);
             /* Oh dear.  Now we can't log anything further. */
+            close_handle(&logger->read_handle);
+            close_handle(&logger->write_handle);
             HeapFree(GetProcessHeap(), 0, logger);
             return 4;
           }
@@ -580,11 +663,15 @@ unsigned long WINAPI log_and_rotate(void *arg) {
     ret = try_write(logger, address, in, &out, &complained);
     size += (__int64) out;
     if (ret < 0) {
+      close_handle(&logger->read_handle);
+      close_handle(&logger->write_handle);
       HeapFree(GetProcessHeap(), 0, logger);
       return 3;
     }
   }
 
+  close_handle(&logger->read_handle);
+  close_handle(&logger->write_handle);
   HeapFree(GetProcessHeap(), 0, logger);
   return 0;
 }