tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-24 14:14:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7847 from Icinga/feature/log-trim-trailing-newlines-7828

Browse Source 
Log: trim trailing newlines
This commit is contained in:
Julian Brost 2020-12-23 14:20:43 +01:00 committed by GitHub
commit 00d8703aad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/base/logger.cpp
View File

@ -10,6 +10,7 @@
#include "base/context.hpp" #include "base/context.hpp"
#include "base/scriptglobal.hpp" #include "base/scriptglobal.hpp"
#include <iostream> #include <iostream>
#include <utility>
using namespace icinga; using namespace icinga;
@ -201,7 +202,13 @@ Log::~Log()
entry.Timestamp = Utility::GetTime(); entry.Timestamp = Utility::GetTime();
entry.Severity = m_Severity; entry.Severity = m_Severity;
entry.Facility = m_Facility; entry.Facility = m_Facility;
entry.Message = m_Buffer.str();
{
auto msg (m_Buffer.str());
msg.erase(msg.find_last_not_of("\n") + 1u);
entry.Message = std::move(msg);
}
if (m_Severity >= LogWarning) { if (m_Severity >= LogWarning) {
ContextTrace context; ContextTrace context;