Use close_handle().
[nssm.git] / io.cpp
diff --git a/io.cpp b/io.cpp
index cf30cd4..0c904be 100644 (file)
--- a/io.cpp
+++ b/io.cpp
@@ -4,7 +4,26 @@
 #define COMPLAINED_WRITE (1 << 1)\r
 #define COMPLAINED_ROTATE (1 << 2)\r
 \r
-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 *tid_ptr, unsigned long *rotate_online) {\r
+static int dup_handle(HANDLE source_handle, HANDLE *dest_handle_ptr, TCHAR *source_description, TCHAR *dest_description, unsigned long flags) {\r
+  if (! dest_handle_ptr) return 1;\r
+\r
+  if (! DuplicateHandle(GetCurrentProcess(), source_handle, GetCurrentProcess(), dest_handle_ptr, 0, true, flags)) {\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, source_description, dest_description, error_string(GetLastError()), 0);\r
+    return 2;\r
+  }\r
+  return 0;\r
+}\r
+\r
+static int dup_handle(HANDLE source_handle, HANDLE *dest_handle_ptr, TCHAR *source_description, TCHAR *dest_description) {\r
+  return dup_handle(source_handle, dest_handle_ptr, source_description, dest_description, DUPLICATE_SAME_ACCESS);\r
+}\r
+\r
+/*\r
+  read_handle:  read from application\r
+  pipe_handle:  stdout of application\r
+  write_handle: to file\r
+*/\r
+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) {\r
   *tid_ptr = 0;\r
 \r
   /* Pipe between application's stdout/stderr and our logging handle. */\r
@@ -40,6 +59,8 @@ static HANDLE create_logging_thread(TCHAR *service_name, TCHAR *path, unsigned l
   logger->size = (__int64) size.QuadPart;\r
   logger->tid_ptr = tid_ptr;\r
   logger->rotate_online = rotate_online;\r
+  logger->rotate_delay = rotate_delay;\r
+  logger->copy_and_truncate = copy_and_truncate;\r
 \r
   HANDLE thread_handle = CreateThread(NULL, 0, log_and_rotate, (void *) logger, 0, logger->tid_ptr);\r
   if (! thread_handle) {\r
@@ -62,8 +83,21 @@ static inline void write_bom(logger_t *logger, unsigned long *out) {
   }\r
 }\r
 \r
+void close_handle(HANDLE *handle, HANDLE *remember) {\r
+  if (remember) *remember = INVALID_HANDLE_VALUE;\r
+  if (! handle) return;\r
+  if (! *handle) return;\r
+  CloseHandle(*handle);\r
+  if (remember) *remember = *handle;\r
+  *handle = 0;\r
+}\r
+\r
+void close_handle(HANDLE *handle) {\r
+  close_handle(handle, NULL);\r
+}\r
+\r
 /* Get path, share mode, creation disposition and flags for a stream. */\r
-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) {\r
+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) {\r
   TCHAR value[NSSM_STDIO_LENGTH];\r
 \r
   /* Path. */\r
@@ -84,7 +118,7 @@ int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned lon
   switch (get_number(key, value, sharing, false)) {\r
     case 0: *sharing = default_sharing; break; /* Missing. */\r
     case 1: break; /* Found. */\r
-    case -2: return 4; break; /* Error. */\r
+    case -2: return 4; /* Error. */\r
   }\r
 \r
   /* CreationDisposition. */\r
@@ -95,7 +129,7 @@ int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned lon
   switch (get_number(key, value, disposition, false)) {\r
     case 0: *disposition = default_disposition; break; /* Missing. */\r
     case 1: break; /* Found. */\r
-    case -2: return 6; break; /* Error. */\r
+    case -2: return 6; /* Error. */\r
   }\r
 \r
   /* Flags. */\r
@@ -106,7 +140,24 @@ int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned lon
   switch (get_number(key, value, flags, false)) {\r
     case 0: *flags = default_flags; break; /* Missing. */\r
     case 1: break; /* Found. */\r
-    case -2: return 8; break; /* Error. */\r
+    case -2: return 8; /* Error. */\r
+  }\r
+\r
+  /* Rotate with CopyFile() and SetEndOfFile(). */\r
+  if (copy_and_truncate) {\r
+    unsigned long data;\r
+    if (_sntprintf_s(value, _countof(value), _TRUNCATE, _T("%s%s"), prefix, NSSM_REG_STDIO_COPY_AND_TRUNCATE) < 0) {\r
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, NSSM_REG_STDIO_COPY_AND_TRUNCATE, _T("get_createfile_parameters()"), 0);\r
+      return 9;\r
+    }\r
+    switch (get_number(key, value, &data, false)) {\r
+      case 0: *copy_and_truncate = false; break; /* Missing. */\r
+      case 1: /* Found. */\r
+        if (data) *copy_and_truncate = true;\r
+        else *copy_and_truncate = false;\r
+        break;\r
+      case -2: return 9; /* Error. */\r
+    }\r
   }\r
 \r
   return 0;\r
@@ -136,9 +187,10 @@ int delete_createfile_parameter(HKEY key, TCHAR *prefix, TCHAR *suffix) {
 }\r
 \r
 HANDLE write_to_file(TCHAR *path, unsigned long sharing, SECURITY_ATTRIBUTES *attributes, unsigned long disposition, unsigned long flags) {\r
+  static LARGE_INTEGER offset = { 0 };\r
   HANDLE ret = CreateFile(path, FILE_WRITE_DATA, sharing, attributes, disposition, flags, 0);\r
-  if (ret) {\r
-    if (SetFilePointer(ret, 0, 0, FILE_END) != INVALID_SET_FILE_POINTER) SetEndOfFile(ret);\r
+  if (ret != INVALID_HANDLE_VALUE) {\r
+    if (SetFilePointerEx(ret, offset, 0, FILE_END)) SetEndOfFile(ret);\r
     return ret;\r
   }\r
 \r
@@ -162,7 +214,7 @@ static void rotated_filename(TCHAR *path, TCHAR *rotated, unsigned long rotated_
   _sntprintf_s(rotated, rotated_len, _TRUNCATE, _T("%s%s"), buffer, extension);\r
 }\r
 \r
-void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsigned long low, unsigned long high) {\r
+void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsigned long delay, unsigned long low, unsigned long high, bool copy_and_truncate) {\r
   unsigned long error;\r
 \r
   /* Now. */\r
@@ -173,7 +225,7 @@ void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsign
 \r
   /* Try to open the file to check if it exists and to get attributes. */\r
   HANDLE file = CreateFile(path, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);\r
-  if (file) {\r
+  if (file != INVALID_HANDLE_VALUE) {\r
     /* Get file attributes. */\r
     if (! GetFileInformationByHandle(file, &info)) {\r
       /* Reuse current time for rotation timestamp. */\r
@@ -219,14 +271,31 @@ void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsign
   rotated_filename(path, rotated, _countof(rotated), &st);\r
 \r
   /* Rotate. */\r
-  if (MoveFile(path, rotated)) {\r
+  bool ok = true;\r
+  TCHAR *function;\r
+  if (copy_and_truncate) {\r
+    function = _T("CopyFile()");\r
+    if (CopyFile(path, rotated, TRUE)) {\r
+      file = write_to_file(path, NSSM_STDOUT_SHARING, 0, NSSM_STDOUT_DISPOSITION, NSSM_STDOUT_FLAGS);\r
+      Sleep(delay);\r
+      SetFilePointer(file, 0, 0, FILE_BEGIN);\r
+      SetEndOfFile(file);\r
+      CloseHandle(file);\r
+    }\r
+    else ok = false;\r
+  }\r
+  else {\r
+    function = _T("MoveFile()");\r
+    if (! MoveFile(path, rotated)) ok = false;\r
+  }\r
+  if (ok) {\r
     log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_ROTATED, service_name, path, rotated, 0);\r
     return;\r
   }\r
   error = GetLastError();\r
 \r
   if (error == ERROR_FILE_NOT_FOUND) return;\r
-  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_ROTATE_FILE_FAILED, service_name, path, _T("MoveFile()"), rotated, error_string(error), 0);\r
+  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_ROTATE_FILE_FAILED, service_name, path, function, rotated, error_string(error), 0);\r
   return;\r
 }\r
 \r
@@ -239,7 +308,7 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
   /* stdin */\r
   if (service->stdin_path[0]) {\r
     si->hStdInput = CreateFile(service->stdin_path, FILE_READ_DATA, service->stdin_sharing, 0, service->stdin_disposition, service->stdin_flags, 0);\r
-    if (! si->hStdInput) {\r
+    if (si->hStdInput == INVALID_HANDLE_VALUE) {\r
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, service->stdin_path, error_string(GetLastError()), 0);\r
       return 2;\r
     }\r
@@ -247,27 +316,27 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
 \r
   /* stdout */\r
   if (service->stdout_path[0]) {\r
-    if (service->rotate_files) rotate_file(service->name, service->stdout_path, service->rotate_seconds, service->rotate_bytes_low, service->rotate_bytes_high);\r
+    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);\r
     HANDLE stdout_handle = write_to_file(service->stdout_path, service->stdout_sharing, 0, service->stdout_disposition, service->stdout_flags);\r
-    if (! stdout_handle) return 4;\r
+    if (stdout_handle == INVALID_HANDLE_VALUE) return 4;\r
+    service->stdout_si = 0;\r
 \r
-    if (service->rotate_files && service->rotate_stdout_online) {\r
+    if (service->use_stdout_pipe) {\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
+      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);\r
       if (! service->stdout_thread) {\r
         CloseHandle(service->stdout_pipe);\r
-        CloseHandle(si->hStdOutput);\r
+        CloseHandle(service->stdout_si);\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
+      if (dup_handle(stdout_handle, &service->stdout_si, NSSM_REG_STDOUT, _T("stdout"), DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) return 4;\r
       service->rotate_stdout_online = NSSM_ROTATE_OFFLINE;\r
     }\r
+\r
+    if (dup_handle(service->stdout_si, &si->hStdOutput, _T("stdout_si"), _T("stdout"))) close_handle(&service->stdout_thread);\r
   }\r
 \r
   /* stderr */\r
@@ -280,34 +349,32 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
       service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
 \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, _T("stderr"), error_string(GetLastError()), 0);\r
-        return 6;\r
-      }\r
+      /* XXX: Here we assume that either both or neither handle must be a pipe. */\r
+      if (dup_handle(service->stdout_si, &service->stderr_si, _T("stdout"), _T("stderr"))) return 6;\r
     }\r
     else {\r
-      if (service->rotate_files) rotate_file(service->name, service->stderr_path, service->rotate_seconds, service->rotate_bytes_low, service->rotate_bytes_high);\r
+      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);\r
       HANDLE stderr_handle = write_to_file(service->stderr_path, service->stderr_sharing, 0, service->stderr_disposition, service->stderr_flags);\r
-      if (! stderr_handle) return 7;\r
+      if (stderr_handle == INVALID_HANDLE_VALUE) return 7;\r
+      service->stderr_si = 0;\r
 \r
-      if (service->rotate_files && service->rotate_stderr_online) {\r
+      if (service->use_stderr_pipe) {\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
+        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);\r
         if (! service->stderr_thread) {\r
           CloseHandle(service->stderr_pipe);\r
-          CloseHandle(si->hStdError);\r
+          CloseHandle(service->stderr_si);\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
+        if (dup_handle(stderr_handle, &service->stderr_si, NSSM_REG_STDERR, _T("stderr"), DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) return 7;\r
         service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
       }\r
     }\r
+\r
+    if (dup_handle(service->stderr_si, &si->hStdError, _T("stderr_si"), _T("stderr"))) close_handle(&service->stderr_thread);\r
   }\r
 \r
   /*\r
@@ -320,22 +387,36 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
 \r
   /* Redirect other handles. */\r
   if (! si->hStdInput) {\r
-    if (! DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_INPUT_HANDLE), GetCurrentProcess(), &si->hStdInput, 0, true, DUPLICATE_SAME_ACCESS)) {\r
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, _T("STD_INPUT_HANDLE"), _T("stdin"), error_string(GetLastError()), 0);\r
-      return 8;\r
-    }\r
+    if (dup_handle(GetStdHandle(STD_INPUT_HANDLE), &si->hStdInput, _T("STD_INPUT_HANDLE"), _T("stdin"))) return 8;\r
   }\r
   if (! si->hStdOutput) {\r
-    if (! DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_OUTPUT_HANDLE), GetCurrentProcess(), &si->hStdOutput, 0, true, DUPLICATE_SAME_ACCESS)) {\r
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, _T("STD_OUTPUT_HANDLE"), _T("stdout"), error_string(GetLastError()), 0);\r
-      return 9;\r
-    }\r
+    if (dup_handle(GetStdHandle(STD_OUTPUT_HANDLE), &si->hStdOutput, _T("STD_OUTPUT_HANDLE"), _T("stdout"))) return 9;\r
   }\r
   if (! si->hStdError)  {\r
-    if (! DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_ERROR_HANDLE), GetCurrentProcess(), &si->hStdError, 0, true, DUPLICATE_SAME_ACCESS)) {\r
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, _T("STD_ERROR_HANDLE"), _T("stderr"), error_string(GetLastError()), 0);\r
-      return 10;\r
+    if (dup_handle(GetStdHandle(STD_ERROR_HANDLE), &si->hStdError, _T("STD_ERROR_HANDLE"), _T("stderr"))) return 10;\r
+  }\r
+\r
+  return 0;\r
+}\r
+\r
+/* Reuse output handles for a hook. */\r
+int use_output_handles(nssm_service_t *service, STARTUPINFO *si) {\r
+  si->dwFlags &= ~STARTF_USESTDHANDLES;\r
+\r
+  if (service->stdout_si) {\r
+    if (dup_handle(service->stdout_si, &si->hStdOutput, _T("stdout_pipe"), _T("hStdOutput"))) return 1;\r
+    si->dwFlags |= STARTF_USESTDHANDLES;\r
+  }\r
+\r
+  if (service->stderr_si) {\r
+    if (dup_handle(service->stderr_si, &si->hStdError, _T("stderr_pipe"), _T("hStdError"))) {\r
+      if (si->hStdOutput) {\r
+        si->dwFlags &= ~STARTF_USESTDHANDLES;\r
+        CloseHandle(si->hStdOutput);\r
+      }\r
+      return 2;\r
     }\r
+    si->dwFlags |= STARTF_USESTDHANDLES;\r
   }\r
 \r
   return 0;\r
@@ -464,8 +545,8 @@ unsigned long WINAPI log_and_rotate(void *arg) {
     address = &buffer;\r
     ret = try_read(logger, address, sizeof(buffer), &in, &complained);\r
     if (ret < 0) {\r
-      CloseHandle(logger->read_handle);\r
-      CloseHandle(logger->write_handle);\r
+      close_handle(&logger->read_handle);\r
+      close_handle(&logger->write_handle);\r
       HeapFree(GetProcessHeap(), 0, logger);\r
       return 2;\r
     }\r
@@ -482,9 +563,9 @@ unsigned long WINAPI log_and_rotate(void *arg) {
           /* Write up to the newline. */\r
           ret = try_write(logger, address, i, &out, &complained);\r
           if (ret < 0) {\r
+            close_handle(&logger->read_handle);\r
+            close_handle(&logger->write_handle);\r
             HeapFree(GetProcessHeap(), 0, logger);\r
-            CloseHandle(logger->read_handle);\r
-            CloseHandle(logger->write_handle);\r
             return 3;\r
           }\r
           size += (__int64) out;\r
@@ -499,15 +580,33 @@ unsigned long WINAPI log_and_rotate(void *arg) {
             MoveFile() will fail if the handle is still open so we must\r
             risk losing everything.\r
           */\r
-          CloseHandle(logger->write_handle);\r
-          if (MoveFile(logger->path, rotated)) {\r
+          if (logger->copy_and_truncate) FlushFileBuffers(logger->write_handle);\r
+          close_handle(&logger->write_handle);\r
+          bool ok = true;\r
+          TCHAR *function;\r
+          if (logger->copy_and_truncate) {\r
+            function = _T("CopyFile()");\r
+            if (CopyFile(logger->path, rotated, TRUE)) {\r
+              HANDLE file = write_to_file(logger->path, NSSM_STDOUT_SHARING, 0, NSSM_STDOUT_DISPOSITION, NSSM_STDOUT_FLAGS);\r
+              Sleep(logger->rotate_delay);\r
+              SetFilePointer(file, 0, 0, FILE_BEGIN);\r
+              SetEndOfFile(file);\r
+              CloseHandle(file);\r
+            }\r
+            else ok = false;\r
+          }\r
+          else {\r
+            function = _T("MoveFile()");\r
+            if (! MoveFile(logger->path, rotated)) ok = false;\r
+          }\r
+          if (ok) {\r
             log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_ROTATED, logger->service_name, logger->path, rotated, 0);\r
             size = 0LL;\r
           }\r
           else {\r
             error = GetLastError();\r
             if (error != ERROR_FILE_NOT_FOUND) {\r
-              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);\r
+              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);\r
               complained |= COMPLAINED_ROTATE;\r
               /* We can at least try to re-open the existing file. */\r
               logger->disposition = OPEN_ALWAYS;\r
@@ -516,13 +615,13 @@ unsigned long WINAPI log_and_rotate(void *arg) {
 \r
           /* Reopen. */\r
           logger->write_handle = write_to_file(logger->path, logger->sharing, 0, logger->disposition, logger->flags);\r
-          if (! logger->write_handle) {\r
+          if (logger->write_handle == INVALID_HANDLE_VALUE) {\r
             error = GetLastError();\r
             log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, logger->path, error_string(error), 0);\r
             /* Oh dear.  Now we can't log anything further. */\r
+            close_handle(&logger->read_handle);\r
+            close_handle(&logger->write_handle);\r
             HeapFree(GetProcessHeap(), 0, logger);\r
-            CloseHandle(logger->read_handle);\r
-            CloseHandle(logger->write_handle);\r
             return 4;\r
           }\r
 \r
@@ -546,15 +645,15 @@ unsigned long WINAPI log_and_rotate(void *arg) {
     ret = try_write(logger, address, in, &out, &complained);\r
     size += (__int64) out;\r
     if (ret < 0) {\r
+      close_handle(&logger->read_handle);\r
+      close_handle(&logger->write_handle);\r
       HeapFree(GetProcessHeap(), 0, logger);\r
-      CloseHandle(logger->read_handle);\r
-      CloseHandle(logger->write_handle);\r
       return 3;\r
     }\r
   }\r
 \r
+  close_handle(&logger->read_handle);\r
+  close_handle(&logger->write_handle);\r
   HeapFree(GetProcessHeap(), 0, logger);\r
-  CloseHandle(logger->read_handle);\r
-  CloseHandle(logger->write_handle);\r
   return 0;\r
 }\r