diff options
Diffstat (limited to 'src/zencore/logging/logger.cpp')
| -rw-r--r-- | src/zencore/logging/logger.cpp | 54 |
1 files changed, 19 insertions, 35 deletions
diff --git a/src/zencore/logging/logger.cpp b/src/zencore/logging/logger.cpp index dd1675bb1..ff1db3edc 100644 --- a/src/zencore/logging/logger.cpp +++ b/src/zencore/logging/logger.cpp @@ -4,27 +4,20 @@ #include <zencore/thread.h> #include <string> -#include <vector> namespace zen::logging { struct Logger::Impl { - std::string m_Name; - std::vector<SinkPtr> m_Sinks; - ErrorHandler* m_ErrorHandler = nullptr; + std::string m_Name; + SinkPtr m_Sink; + ErrorHandler* m_ErrorHandler = nullptr; }; Logger::Logger(std::string_view InName, SinkPtr InSink) : m_Impl(std::make_unique<Impl>()) { m_Impl->m_Name = InName; - m_Impl->m_Sinks.push_back(std::move(InSink)); -} - -Logger::Logger(std::string_view InName, std::span<const SinkPtr> InSinks) : m_Impl(std::make_unique<Impl>()) -{ - m_Impl->m_Name = InName; - m_Impl->m_Sinks.assign(InSinks.begin(), InSinks.end()); + m_Impl->m_Sink = std::move(InSink); } Logger::~Logger() = default; @@ -49,20 +42,17 @@ Logger::Log(const LogPoint& Point, fmt::format_args Args) void Logger::SinkIt(const LogMessage& Msg) { - for (auto& CurrentSink : m_Impl->m_Sinks) + if (m_Impl->m_Sink && m_Impl->m_Sink->ShouldLog(Msg.GetLevel())) { - if (CurrentSink->ShouldLog(Msg.GetLevel())) + try { - try - { - CurrentSink->Log(Msg); - } - catch (const std::exception& Ex) + m_Impl->m_Sink->Log(Msg); + } + catch (const std::exception& Ex) + { + if (m_Impl->m_ErrorHandler) { - if (m_Impl->m_ErrorHandler) - { - m_Impl->m_ErrorHandler->HandleError(Ex.what()); - } + m_Impl->m_ErrorHandler->HandleError(Ex.what()); } } } @@ -80,11 +70,11 @@ Logger::FlushIfNeeded(LogLevel InLevel) void Logger::Flush() { - for (auto& CurrentSink : m_Impl->m_Sinks) + if (m_Impl->m_Sink) { try { - CurrentSink->Flush(); + m_Impl->m_Sink->Flush(); } catch (const std::exception& Ex) { @@ -97,15 +87,9 @@ Logger::Flush() } void -Logger::SetSinks(std::vector<SinkPtr> InSinks) -{ - m_Impl->m_Sinks = std::move(InSinks); -} - -void -Logger::AddSink(SinkPtr InSink) +Logger::SetSink(SinkPtr InSink) { - m_Impl->m_Sinks.push_back(std::move(InSink)); + m_Impl->m_Sink = std::move(InSink); } void @@ -117,9 +101,9 @@ Logger::SetErrorHandler(ErrorHandler* Handler) void Logger::SetFormatter(std::unique_ptr<Formatter> InFormatter) { - for (auto& CurrentSink : m_Impl->m_Sinks) + if (m_Impl->m_Sink) { - CurrentSink->SetFormatter(InFormatter->Clone()); + m_Impl->m_Sink->SetFormatter(std::move(InFormatter)); } } @@ -132,7 +116,7 @@ Logger::Name() const Ref<Logger> Logger::Clone(std::string_view NewName) const { - Ref<Logger> Cloned(new Logger(NewName, m_Impl->m_Sinks)); + Ref<Logger> Cloned(new Logger(NewName, m_Impl->m_Sink)); Cloned->SetLevel(m_Level.load(std::memory_order_relaxed)); Cloned->SetFlushLevel(m_FlushLevel.load(std::memory_order_relaxed)); Cloned->SetErrorHandler(m_Impl->m_ErrorHandler); |