From 481ef9ea721488037e0f971f25350c3a75f7986a Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 11 Aug 2023 13:07:37 +0200 Subject: [PATCH] Merge Log#Log() methods --- lib/base/logger.cpp | 8 ++------ lib/base/logger.hpp | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/base/logger.cpp b/lib/base/logger.cpp index d8f4900c2..8cf7a9309 100644 --- a/lib/base/logger.cpp +++ b/lib/base/logger.cpp @@ -346,17 +346,13 @@ void Logger::UpdateCheckObjectFilterCache() } Log::Log(LogSeverity severity, String facility, const String& message) - : Log(severity, std::move(facility)) + : m_Severity(severity), m_Facility(std::move(facility)), m_IsNoOp(severity < Logger::GetMinLogSeverity()) { - if (!m_IsNoOp) { + if (!m_IsNoOp && !message.IsEmpty()) { m_Buffer << message; } } -Log::Log(LogSeverity severity, String facility) - : m_Severity(severity), m_Facility(std::move(facility)), m_IsNoOp(severity < Logger::GetMinLogSeverity()) -{ } - /** * Writes the message to the application's log. */ diff --git a/lib/base/logger.hpp b/lib/base/logger.hpp index 2f16d0f65..cdc0482e8 100644 --- a/lib/base/logger.hpp +++ b/lib/base/logger.hpp @@ -122,9 +122,7 @@ public: Log(const Log& other) = delete; Log& operator=(const Log& rhs) = delete; - Log(LogSeverity severity, String facility, const String& message); - Log(LogSeverity severity, String facility); - + Log(LogSeverity severity, String facility, const String& message = String()); ~Log(); template