[checkmk-commits] Check_MK Git: check_mk: #2064 windows agent: crash.log now uses \r\n as newline

Module: check_mk Branch: master Commit: 7a840f3c98c782542b4767be78d84240d420e712 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a840f3c98c782… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 14 12:04:13 2015 +0200 #2064 windows agent: crash.log now uses \r\n as newline --- .werks/2064 | 10 ++++++++++ ChangeLog | 1 + agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 181760 -> 181760 bytes agents/windows/check_mk_agent.msi | Bin 716288 -> 716288 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 181760 -> 181760 bytes agents/windows/install_agent-64.exe | Bin 177834 -> 177834 bytes agents/windows/install_agent.exe | Bin 158868 -> 158870 bytes 8 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2064 b/.werks/2064 new file mode 100644 index 0000000..92036c8 --- /dev/null +++ b/.werks/2064 @@ -0,0 +1,10 @@ +Title: windows agent: crash.log now uses \r\n as newline +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1429005583 + + diff --git a/ChangeLog b/ChangeLog index aa16b2c..bdec7b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -320,6 +320,7 @@ * 2173 FIX: mk-job: Fixed quoting of command line arguments * 2198 FIX: windows_updates: Fix missing warning if reboot required in case forced reboot is in the past... * 1955 FIX: lnx_quota: Fixed status message to show the correct values of limits... + * 2064 FIX: windows agent: crash.log now uses \r\n as newline Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 1d4f63f..106c062 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3665,7 +3665,7 @@ void crash_log(const char *format, ...) dwBytesToWrite = (DWORD)strlen(buffer); WriteFile(g_connectionlog_file, buffer, dwBytesToWrite, &dwBytesWritten, NULL); - WriteFile(g_connectionlog_file, "\n", 1, &dwBytesWritten, NULL); + WriteFile(g_connectionlog_file, "\r\n", 2, &dwBytesWritten, NULL); FlushFileBuffers(g_connectionlog_file); } ReleaseMutex(crashlogMutex); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 92111a6..ac3ab0d 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index ea97741..0d97d51 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index b5b5eda..c393ffa 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 18edc83..ee00043 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index c1e1ab0..3420868 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ