mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-24 06:05:01 +02:00
Log: don't construct std::ostringstream for no-op messages
This commit removes the existing m_IsNoOp bool and instead wraps the m_Buffer std::ostringstream into std::optional. Functionally, this is pretty much the same, with the exception that std::ostringstream is no longer constructed for messages that will be discarded later.
This commit is contained in:
parent
ef0bc8366c
commit
8d74cc631c
@ -247,21 +247,25 @@ void Logger::UpdateMinLogSeverity()
|
|||||||
Log::Log(LogSeverity severity, String facility, const String& message)
|
Log::Log(LogSeverity severity, String facility, const String& message)
|
||||||
: Log(severity, std::move(facility))
|
: Log(severity, std::move(facility))
|
||||||
{
|
{
|
||||||
if (!m_IsNoOp) {
|
*this << message;
|
||||||
m_Buffer << message;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Log::Log(LogSeverity severity, String facility)
|
Log::Log(LogSeverity severity, String facility)
|
||||||
: m_Severity(severity), m_Facility(std::move(facility)), m_IsNoOp(severity < Logger::GetMinLogSeverity())
|
{
|
||||||
{ }
|
// Only fully initialize the object if it's actually going to be logged.
|
||||||
|
if (severity >= Logger::GetMinLogSeverity()) {
|
||||||
|
m_Severity = severity;
|
||||||
|
m_Facility = std::move(facility);
|
||||||
|
m_Buffer.emplace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Writes the message to the application's log.
|
* Writes the message to the application's log.
|
||||||
*/
|
*/
|
||||||
Log::~Log()
|
Log::~Log()
|
||||||
{
|
{
|
||||||
if (m_IsNoOp) {
|
if (!m_Buffer) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -271,7 +275,7 @@ Log::~Log()
|
|||||||
entry.Facility = m_Facility;
|
entry.Facility = m_Facility;
|
||||||
|
|
||||||
{
|
{
|
||||||
auto msg (m_Buffer.str());
|
auto msg (m_Buffer->str());
|
||||||
msg.erase(msg.find_last_not_of("\n") + 1u);
|
msg.erase(msg.find_last_not_of("\n") + 1u);
|
||||||
|
|
||||||
entry.Message = std::move(msg);
|
entry.Message = std::move(msg);
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#include "base/atomic.hpp"
|
#include "base/atomic.hpp"
|
||||||
#include "base/i2-base.hpp"
|
#include "base/i2-base.hpp"
|
||||||
#include "base/logger-ti.hpp"
|
#include "base/logger-ti.hpp"
|
||||||
|
#include <optional>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
@ -121,8 +122,8 @@ public:
|
|||||||
template<typename T>
|
template<typename T>
|
||||||
Log& operator<<(T&& val)
|
Log& operator<<(T&& val)
|
||||||
{
|
{
|
||||||
if (!m_IsNoOp) {
|
if (m_Buffer) {
|
||||||
m_Buffer << std::forward<T>(val);
|
*m_Buffer << std::forward<T>(val);
|
||||||
}
|
}
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
@ -131,8 +132,11 @@ public:
|
|||||||
private:
|
private:
|
||||||
LogSeverity m_Severity;
|
LogSeverity m_Severity;
|
||||||
String m_Facility;
|
String m_Facility;
|
||||||
std::ostringstream m_Buffer;
|
/**
|
||||||
bool m_IsNoOp;
|
* Stream for incrementally generating the log message. If the message will be discarded as it's level currently
|
||||||
|
* isn't logged, it will be empty as the stream doesn't need to be initialized in this case.
|
||||||
|
*/
|
||||||
|
std::optional<std::ostringstream> m_Buffer;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern template Log& Log::operator<<(const Value&);
|
extern template Log& Log::operator<<(const Value&);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user