X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=io.cpp;h=0ba7e1854f3b88865baef1d5ee08fa1362adecf7;hb=dee49fc1a0804f06687299b8e9612a3fce1c5e9a;hp=ce455a3bbc94764b04ae4c7b9dc50d537c004b98;hpb=203bfaec37cdcf72dc9c9633866179d64795780f;p=nssm.git

diff --git a/io.cpp b/io.cpp
index ce455a3..0ba7e18 100644
--- a/io.cpp
+++ b/io.cpp
@@ -3,6 +3,8 @@
 #define COMPLAINED_READ (1 << 0)
 #define COMPLAINED_WRITE (1 << 1)
 #define COMPLAINED_ROTATE (1 << 2)
+#define TIMESTAMP_FORMAT "%04u-%02u-%02u %02u:%02u:%02u.%03u: "
+#define TIMESTAMP_LEN 25
 
 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;
@@ -23,7 +25,7 @@ static int dup_handle(HANDLE source_handle, HANDLE *dest_handle_ptr, TCHAR *sour
   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) {
+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 timestamp_log, bool copy_and_truncate) {
   *tid_ptr = 0;
 
   /* Pipe between application's stdout/stderr and our logging handle. */
@@ -58,6 +60,8 @@ static HANDLE create_logging_thread(TCHAR *service_name, TCHAR *path, unsigned l
   logger->write_handle = *write_handle_ptr;
   logger->size = (__int64) size.QuadPart;
   logger->tid_ptr = tid_ptr;
+  logger->timestamp_log = timestamp_log;
+  logger->line_length = 0;
   logger->rotate_online = rotate_online;
   logger->rotate_delay = rotate_delay;
   logger->copy_and_truncate = copy_and_truncate;
@@ -83,6 +87,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];
@@ -288,6 +305,7 @@ void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsign
 
 int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
   if (! si) return 1;
+  bool inherit_handles = false;
 
   /* Allocate a new console so we get a fresh stdin, stdout and stderr. */
   alloc_console(service);
@@ -299,6 +317,8 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, service->stdin_path, error_string(GetLastError()), 0);
       return 2;
     }
+
+    inherit_handles = true;

   }
 
   /* stdout */
@@ -310,7 +330,7 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
 
     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);
+      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->timestamp_log, service->stdout_copy_and_truncate);
       if (! service->stdout_thread) {
         CloseHandle(service->stdout_pipe);
         CloseHandle(service->stdout_si);
@@ -323,12 +343,9 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
       service->rotate_stdout_online = NSSM_ROTATE_OFFLINE;
     }
 
-    if (dup_handle(service->stdout_si, &si->hStdOutput, _T("stdout_si"), _T("stdout"))) {
-      if (service->stdout_thread) {
-        CloseHandle(service->stdout_thread);
-        service->stdout_thread = 0;
-      }
-    }
+    if (dup_handle(service->stdout_si, &si->hStdOutput, _T("stdout_si"), _T("stdout"))) close_handle(&service->stdout_thread);
+
+    inherit_handles = true;

   }
 
   /* stderr */
@@ -352,7 +369,7 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
 
       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);
+        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->timestamp_log, service->stderr_copy_and_truncate);
         if (! service->stderr_thread) {
           CloseHandle(service->stderr_pipe);
           CloseHandle(service->stderr_si);
@@ -366,32 +383,16 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
       }
     }
 
-    if (dup_handle(service->stderr_si, &si->hStdError, _T("stderr_si"), _T("stderr"))) {
-      if (service->stderr_thread) {
-        CloseHandle(service->stderr_thread);
-        service->stderr_thread = 0;
-      }
-    }
+    if (dup_handle(service->stderr_si, &si->hStdError, _T("stderr_si"), _T("stderr"))) close_handle(&service->stderr_thread);
+
+    inherit_handles = true;

   }
 
   /*
     We need to set the startup_info flags to make the new handles
     inheritable by the new process.
   */
-  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;
-  }
+  if (inherit_handles) si->dwFlags |= STARTF_USESTDHANDLES;
 
   return 0;
 }
@@ -425,6 +426,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.
@@ -512,6 +531,69 @@ complain_write:
   return ret;
 }
 
+/* Note that the timestamp is created in UTF-8. */
+static inline int write_timestamp(logger_t *logger, unsigned long charsize, unsigned long *out, int *complained) {
+  char timestamp[TIMESTAMP_LEN + 1];
+
+  SYSTEMTIME now;
+  GetSystemTime(&now);
+  _snprintf_s(timestamp, _countof(timestamp), _TRUNCATE, TIMESTAMP_FORMAT, now.wYear, now.wMonth, now.wDay, now.wHour, now.wMinute, now.wSecond, now.wMilliseconds);
+
+  if (charsize == sizeof(char)) return try_write(logger, (void *) timestamp, TIMESTAMP_LEN, out, complained);
+
+  wchar_t *utf16;
+  unsigned long utf16len;
+  if (to_utf16(timestamp, &utf16, &utf16len)) return -1;
+  int ret = try_write(logger, (void *) *utf16, utf16len * sizeof(wchar_t), out, complained);
+  HeapFree(GetProcessHeap(), 0, utf16);
+  return ret;
+}
+
+static int write_with_timestamp(logger_t *logger, void *address, unsigned long bufsize, unsigned long *out, int *complained, unsigned long charsize) {
+  if (logger->timestamp_log) {
+    unsigned long log_out;
+    int log_complained;
+    unsigned long timestamp_out = 0;
+    int timestamp_complained;
+    if (! logger->line_length) {
+      write_timestamp(logger, charsize, &timestamp_out, &timestamp_complained);
+      logger->line_length += (__int64) timestamp_out;
+      *out += timestamp_out;
+      *complained |= timestamp_complained;
+    }
+
+    unsigned long i;
+    void *line = address;
+    unsigned long offset = 0;
+    int ret;
+    for (i = 0; i < bufsize; i++) {
+      if (((char *) address)[i] == '\n') {
+        ret = try_write(logger, line, i - offset + 1, &log_out, &log_complained);
+        line = (void *) ((char *) line + i - offset + 1);
+        logger->line_length = 0LL;
+        *out += log_out;
+        *complained |= log_complained;
+        offset = i + 1;
+        if (offset < bufsize) {
+          write_timestamp(logger, charsize, &timestamp_out, &timestamp_complained);
+          logger->line_length += (__int64) timestamp_out;
+          *out += timestamp_out;
+          *complained |= timestamp_complained;
+        }
+      }
+    }
+
+    if (offset < bufsize) {
+      ret = try_write(logger, line, bufsize - offset, &log_out, &log_complained);
+      *out += log_out;
+      *complained |= log_complained;
+    }
+
+    return ret;
+  }
+  else return try_write(logger, address, bufsize, out, complained);
+}
+
 /* Wrapper to be called in a new thread for logging. */
 unsigned long WINAPI log_and_rotate(void *arg) {
   logger_t *logger = (logger_t *) arg;
@@ -542,8 +624,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;
     }
@@ -560,8 +642,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;
           }
@@ -578,7 +660,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) {
@@ -616,8 +698,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;
           }
@@ -629,9 +711,9 @@ unsigned long WINAPI log_and_rotate(void *arg) {
       }
     }
 
+    if (! size || logger->timestamp_log) if (! charsize) charsize = guess_charsize(address, in);
     if (! size) {
       /* Write a BOM to the new file. */
-      if (! charsize) charsize = guess_charsize(address, in);
       if (charsize == sizeof(wchar_t)) write_bom(logger, &out);
       size += (__int64) out;
     }
@@ -639,18 +721,18 @@ unsigned long WINAPI log_and_rotate(void *arg) {
     /* Write the data, if any. */
     if (! in) continue;
 
-    ret = try_write(logger, address, in, &out, &complained);
+    ret = write_with_timestamp(logger, address, in, &out, &complained, charsize);
     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;
 }