From: Iain Patterson <me@iain.cx>
Date: Sun, 19 Jan 2014 17:12:52 +0000 (+0000)
Subject: Fixed NSSM_EVENT_DUPLICATEHANDLE_FAILED message.
X-Git-Tag: v2.22~47
X-Git-Url: http://git.iain.cx/?a=commitdiff_plain;h=5ba652d97bd85a8ea84560e39fbffee5155825c1;p=nssm.git

Fixed NSSM_EVENT_DUPLICATEHANDLE_FAILED message.

We were supposed to add a parameter explaining which handle couldn't be
duplicated.
---

diff --git a/io.cpp b/io.cpp
index 3f80810..d18e31c 100644
--- a/io.cpp
+++ b/io.cpp
@@ -288,7 +288,7 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
 
     if (! service->stdout_thread) {
       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);
+        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, _T("stdout"), error_string(GetLastError()), 0);
         return 4;
       }
       service->rotate_stdout_online = NSSM_ROTATE_OFFLINE;
@@ -314,7 +314,7 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
       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);
+          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, _T("stderr"), error_string(GetLastError()), 0);
           return 6;
         }
       }
@@ -336,7 +336,7 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
 
       if (! service->stderr_thread) {
         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);
+          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDERR, _T("stderr"), error_string(GetLastError()), 0);
           return 7;
         }
         service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;