#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 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
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
}\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
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, prefix, _T("get_createfile_parameters()"), 0);\r
return 1;\r
}\r
- switch (expand_parameter(key, value, path, MAX_PATH, true, false)) {\r
+ switch (expand_parameter(key, value, path, PATH_LENGTH, true, false)) {\r
case 0: if (! path[0]) return 0; break; /* OK. */\r
default: return 2; /* Error. */\r
}\r
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
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
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
return 1;\r
}\r
\r
-HANDLE append_to_file(TCHAR *path, unsigned long sharing, SECURITY_ATTRIBUTES *attributes, unsigned long disposition, unsigned long flags) {\r
- HANDLE ret;\r
-\r
- /* Try to append to the file first. */\r
- ret = CreateFile(path, FILE_APPEND_DATA, sharing, attributes, disposition, flags, 0);\r
- if (ret) {\r
- SetEndOfFile(ret);\r
+HANDLE write_to_file(TCHAR *path, unsigned long sharing, SECURITY_ATTRIBUTES *attributes, unsigned long disposition, unsigned long flags) {\r
+ HANDLE ret = CreateFile(path, FILE_WRITE_DATA, sharing, attributes, disposition, flags, 0);\r
+ if (ret!= INVALID_HANDLE_VALUE) {\r
+ if (SetFilePointer(ret, 0, 0, FILE_END) != INVALID_SET_FILE_POINTER) SetEndOfFile(ret);\r
return ret;\r
}\r
\r
- unsigned long error = GetLastError();\r
- if (error != ERROR_FILE_NOT_FOUND) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, path, error_string(error), 0);\r
- return (HANDLE) 0;\r
- }\r
-\r
- /* It didn't exist. Create it. */\r
- ret = CreateFile(path, FILE_WRITE_DATA, sharing, attributes, disposition, flags, 0);\r
- if (! ret) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, path, error_string(GetLastError()), 0);\r
-\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, path, error_string(GetLastError()), 0);\r
return ret;\r
}\r
\r
GetSystemTime(st);\r
}\r
\r
- TCHAR buffer[MAX_PATH];\r
+ TCHAR buffer[PATH_LENGTH];\r
memmove(buffer, path, sizeof(buffer));\r
TCHAR *ext = PathFindExtension(buffer);\r
- TCHAR extension[MAX_PATH];\r
+ TCHAR extension[PATH_LENGTH];\r
_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);\r
*ext = _T('\0');\r
_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
\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
/* Get new filename. */\r
FileTimeToSystemTime(&info.ftLastWriteTime, &st);\r
\r
- TCHAR rotated[MAX_PATH];\r
+ TCHAR rotated[PATH_LENGTH];\r
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
-int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {\r
- bool set_flags = false;\r
+int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {\r
+ if (! si) return 1;\r
\r
- /* Standard security attributes allowing inheritance. */\r
- SECURITY_ATTRIBUTES attributes;\r
- ZeroMemory(&attributes, sizeof(attributes));\r
- attributes.bInheritHandle = true;\r
+ /* Allocate a new console so we get a fresh stdin, stdout and stderr. */\r
+ alloc_console(service);\r
\r
/* stdin */\r
- 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)) {\r
- service->stdin_sharing = service->stdin_disposition = service->stdin_flags = 0;\r
- ZeroMemory(service->stdin_path, _countof(service->stdin_path) * sizeof(TCHAR));\r
- return 1;\r
- }\r
- if (si && service->stdin_path[0]) {\r
- si->hStdInput = CreateFile(service->stdin_path, FILE_READ_DATA, service->stdin_sharing, &attributes, service->stdin_disposition, service->stdin_flags, 0);\r
- if (! si->hStdInput) {\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 == 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
- set_flags = true;\r
}\r
\r
/* stdout */\r
- 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)) {\r
- service->stdout_sharing = service->stdout_disposition = service->stdout_flags = 0;\r
- ZeroMemory(service->stdout_path, _countof(service->stdout_path) * sizeof(TCHAR));\r
- return 3;\r
- }\r
- if (si && 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
- HANDLE stdout_handle = append_to_file(service->stdout_path, service->stdout_sharing, 0, service->stdout_disposition, service->stdout_flags);\r
- if (! stdout_handle) return 4;\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, 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 == INVALID_HANDLE_VALUE) return 4;\r
\r
if (service->rotate_files && service->rotate_stdout_online) {\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, &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);\r
if (! service->stdout_thread) {\r
CloseHandle(service->stdout_pipe);\r
CloseHandle(si->hStdOutput);\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, error_string(GetLastError()), 0);\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, _T("stdout"), error_string(GetLastError()), 0);\r
return 4;\r
}\r
service->rotate_stdout_online = NSSM_ROTATE_OFFLINE;\r
}\r
-\r
- set_flags = true;\r
}\r
\r
/* stderr */\r
- if (get_createfile_parameters(key, NSSM_REG_STDERR, service->stderr_path, &service->stderr_sharing, NSSM_STDERR_SHARING, &service->stderr_disposition, NSSM_STDERR_DISPOSITION, &service->stderr_flags, NSSM_STDERR_FLAGS)) {\r
- service->stderr_sharing = service->stderr_disposition = service->stderr_flags = 0;\r
- ZeroMemory(service->stderr_path, _countof(service->stderr_path) * sizeof(TCHAR));\r
- return 5;\r
- }\r
if (service->stderr_path[0]) {\r
/* Same as stdout? */\r
if (str_equiv(service->stderr_path, service->stdout_path)) {\r
service->stderr_flags = service->stdout_flags;\r
service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
\r
- if (si) {\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, error_string(GetLastError()), 0);\r
- return 6;\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
}\r
- else if (si) {\r
- if (service->rotate_files) rotate_file(service->name, service->stderr_path, service->rotate_seconds, service->rotate_bytes_low, service->rotate_bytes_high);\r
- HANDLE stderr_handle = append_to_file(service->stderr_path, service->stderr_sharing, 0, service->stderr_disposition, service->stderr_flags);\r
- if (! stderr_handle) return 7;\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, 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 == INVALID_HANDLE_VALUE) return 7;\r
\r
if (service->rotate_files && service->rotate_stderr_online) {\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, &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);\r
if (! service->stderr_thread) {\r
CloseHandle(service->stderr_pipe);\r
CloseHandle(si->hStdError);\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, error_string(GetLastError()), 0);\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDERR, _T("stderr"), error_string(GetLastError()), 0);\r
return 7;\r
}\r
service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
}\r
-\r
- set_flags = true;\r
}\r
}\r
\r
- if (! set_flags) return 0;\r
-\r
/*\r
We need to set the startup_info flags to make the new handles\r
inheritable by the new process.\r
*/\r
- if (si) si->dwFlags |= STARTF_USESTDHANDLES;\r
+ si->dwFlags |= STARTF_USESTDHANDLES;\r
+\r
+ if (service->no_console) return 0;\r
+\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
+ }\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
+ }\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
+ }\r
+ }\r
\r
return 0;\r
}\r
/* Write up to the newline. */\r
ret = try_write(logger, address, i, &out, &complained);\r
if (ret < 0) {\r
- HeapFree(GetProcessHeap(), 0, logger);\r
CloseHandle(logger->read_handle);\r
CloseHandle(logger->write_handle);\r
+ HeapFree(GetProcessHeap(), 0, logger);\r
return 3;\r
}\r
size += (__int64) out;\r
\r
/* Rotate. */\r
*logger->rotate_online = NSSM_ROTATE_ONLINE;\r
- TCHAR rotated[MAX_PATH];\r
+ TCHAR rotated[PATH_LENGTH];\r
rotated_filename(logger->path, rotated, _countof(rotated), 0);\r
\r
/*\r
MoveFile() will fail if the handle is still open so we must\r
risk losing everything.\r
*/\r
+ if (logger->copy_and_truncate) FlushFileBuffers(logger->write_handle);\r
CloseHandle(logger->write_handle);\r
- if (MoveFile(logger->path, rotated)) {\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
}\r
\r
/* Reopen. */\r
- logger->write_handle = append_to_file(logger->path, logger->sharing, 0, logger->disposition, logger->flags);\r
- if (! logger->write_handle) {\r
+ logger->write_handle = write_to_file(logger->path, logger->sharing, 0, logger->disposition, logger->flags);\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
- HeapFree(GetProcessHeap(), 0, logger);\r
CloseHandle(logger->read_handle);\r
CloseHandle(logger->write_handle);\r
+ HeapFree(GetProcessHeap(), 0, logger);\r
return 4;\r
}\r
\r
ret = try_write(logger, address, in, &out, &complained);\r
size += (__int64) out;\r
if (ret < 0) {\r
- HeapFree(GetProcessHeap(), 0, logger);\r
CloseHandle(logger->read_handle);\r
CloseHandle(logger->write_handle);\r
+ HeapFree(GetProcessHeap(), 0, logger);\r
return 3;\r
}\r
}\r
\r
- HeapFree(GetProcessHeap(), 0, logger);\r
CloseHandle(logger->read_handle);\r
CloseHandle(logger->write_handle);\r
+ HeapFree(GetProcessHeap(), 0, logger);\r
return 0;\r
}\r
git://git.iain.cx/iain / nssm.git / blobdiff