X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=io.cpp;h=48611b09c57f4719e0d4f43d9f415afa60b0c3c5;hb=ee9a86c8408feaf173733aea12a80211e5d74483;hp=9d3795c5a43479090d8f0f0c64896998a1707a85;hpb=4f7514a8b856d31e1f26984e54bb5e27d475f71a;p=nssm.git

diff --git a/io.cpp b/io.cpp
index 9d3795c..48611b0 100644
--- a/io.cpp
+++ b/io.cpp
@@ -18,6 +18,11 @@ static int dup_handle(HANDLE source_handle, HANDLE *dest_handle_ptr, TCHAR *sour
   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;
 
@@ -78,6 +83,19 @@ 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, bool *copy_and_truncate) {
   TCHAR value[NSSM_STDIO_LENGTH];
@@ -169,9 +187,10 @@ int delete_createfile_parameter(HKEY key, TCHAR *prefix, TCHAR *suffix) {
 }
 
 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 (SetFilePointer(ret, 0, 0, FILE_END) != INVALID_SET_FILE_POINTER) SetEndOfFile(ret);
+  if (ret != INVALID_HANDLE_VALUE) {
+    if (SetFilePointerEx(ret, offset, 0, FILE_END)) SetEndOfFile(ret);
     return ret;
   }
 
@@ -300,21 +319,24 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
     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->rotate_files && service->rotate_stdout_online) {
+    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, &si->hStdOutput, &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);
+      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(si->hStdOutput);
+        CloseHandle(service->stdout_si);
       }
     }
     else service->stdout_thread = 0;
 
     if (! service->stdout_thread) {
-      if (dup_handle(stdout_handle, &si->hStdOutput, NSSM_REG_STDOUT, _T("stdout"), DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) return 4;
+      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;
     }
+
+    if (dup_handle(service->stdout_si, &si->hStdOutput, _T("stdout_si"), _T("stdout"))) close_handle(&service->stdout_thread);
   }
 
   /* stderr */
@@ -327,28 +349,32 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
       service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;
 
       /* Two handles to the same file will create a race. */
-      if (dup_handle(si->hStdOutput, &si->hStdError, _T("stdout"), _T("stderr"))) return 6;
+      /* 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 (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->rotate_files && service->rotate_stderr_online) {
+      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, &si->hStdError, &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);
+        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(si->hStdError);
+          CloseHandle(service->stderr_si);
         }
       }
       else service->stderr_thread = 0;
 
       if (! service->stderr_thread) {
-        if (dup_handle(stderr_handle, &si->hStdError, NSSM_REG_STDERR, _T("stderr"), DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) return 7;
+        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;
       }
     }
+
+    if (dup_handle(service->stderr_si, &si->hStdError, _T("stderr_si"), _T("stderr"))) close_handle(&service->stderr_thread);
   }
 
   /*
@@ -368,7 +394,29 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
   }
   if (! si->hStdError)  {
     if (dup_handle(GetStdHandle(STD_ERROR_HANDLE), &si->hStdError, _T("STD_ERROR_HANDLE"), _T("stderr"))) return 10;
+  }
+
+  return 0;
+}
+
+/* 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;
@@ -380,6 +428,24 @@ void close_output_handles(STARTUPINFO *si) {
   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);
+}
+
 /*
   Try multiple times to read from a file.
   Returns:  0 on success.
@@ -497,8 +563,8 @@ unsigned long WINAPI log_and_rotate(void *arg) {
     address = &buffer;
     ret = try_read(logger, address, sizeof(buffer), &in, &complained);
     if (ret < 0) {
-      CloseHandle(logger->read_handle);
-      CloseHandle(logger->write_handle);
+      close_handle(&logger->read_handle);
+      close_handle(&logger->write_handle);
       HeapFree(GetProcessHeap(), 0, logger);
       return 2;
     }
@@ -515,8 +581,8 @@ unsigned long WINAPI log_and_rotate(void *arg) {
           /* Write up to the newline. */
           ret = try_write(logger, address, i, &out, &complained);
           if (ret < 0) {
-            CloseHandle(logger->read_handle);
-            CloseHandle(logger->write_handle);
+            close_handle(&logger->read_handle);
+            close_handle(&logger->write_handle);
             HeapFree(GetProcessHeap(), 0, logger);
             return 3;
           }
@@ -533,7 +599,7 @@ unsigned long WINAPI log_and_rotate(void *arg) {
             risk losing everything.
           */
           if (logger->copy_and_truncate) FlushFileBuffers(logger->write_handle);
-          CloseHandle(logger->write_handle);
+          close_handle(&logger->write_handle);
           bool ok = true;
           TCHAR *function;
           if (logger->copy_and_truncate) {
@@ -571,8 +637,8 @@ unsigned long WINAPI log_and_rotate(void *arg) {
             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. */
-            CloseHandle(logger->read_handle);
-            CloseHandle(logger->write_handle);
+            close_handle(&logger->read_handle);
+            close_handle(&logger->write_handle);
             HeapFree(GetProcessHeap(), 0, logger);
             return 4;
           }
@@ -597,15 +663,15 @@ unsigned long WINAPI log_and_rotate(void *arg) {
     ret = try_write(logger, address, in, &out, &complained);
     size += (__int64) out;
     if (ret < 0) {
-      CloseHandle(logger->read_handle);
-      CloseHandle(logger->write_handle);
+      close_handle(&logger->read_handle);
+      close_handle(&logger->write_handle);
       HeapFree(GetProcessHeap(), 0, logger);
       return 3;
     }
   }
 
-  CloseHandle(logger->read_handle);
-  CloseHandle(logger->write_handle);
+  close_handle(&logger->read_handle);
+  close_handle(&logger->write_handle);
   HeapFree(GetProcessHeap(), 0, logger);
   return 0;
 }