From 835edde38edfcef458a6f71c202b37f3e3e2e427 Mon Sep 17 00:00:00 2001 From: kaoru Date: Tue, 7 Jan 2025 21:57:34 +0800 Subject: [PATCH] refactor(Logger): simplify logging methods and remove redundant overloads --- sese/record/Logger.cpp | 16 ++++++++++++++ sese/record/Logger.h | 48 +++++++++++------------------------------- 2 files changed, 28 insertions(+), 36 deletions(-) diff --git a/sese/record/Logger.cpp b/sese/record/Logger.cpp index c4c26957ac..de634fa032 100644 --- a/sese/record/Logger.cpp +++ b/sese/record/Logger.cpp @@ -116,6 +116,22 @@ void Logger::dump(const void *buffer, size_t length) noexcept { Logger *getLogger() noexcept { return logger; } +void Logger::debug(PatternAndLocation pattern_and_location) { + prelog(pattern_and_location, Level::DEBUG, std::string(pattern_and_location.pattern)); +} + +void Logger::info(PatternAndLocation pattern_and_location) { + prelog(pattern_and_location, Level::INFO, std::string(pattern_and_location.pattern)); +} + +void Logger::warn(PatternAndLocation pattern_and_location) { + prelog(pattern_and_location, Level::WARN, std::string(pattern_and_location.pattern)); +} + +void Logger::error(PatternAndLocation pattern_and_location) { + prelog(pattern_and_location, Level::ERR, std::string(pattern_and_location.pattern)); +} + int32_t LoggerInitiateTask::init() noexcept { // Initialize the logger #ifdef USE_ASYNC_LOGGER diff --git a/sese/record/Logger.h b/sese/record/Logger.h index 84716eb290..5f70ab43bf 100644 --- a/sese/record/Logger.h +++ b/sese/record/Logger.h @@ -95,29 +95,25 @@ class Logger { } }; - template = 0> + template static void debug(PatternAndLocation pattern_and_location, ARGS &&...args); - template = 0> - static void debug(PatternAndLocation pattern_and_location, ARGS &&...); + static void debug(PatternAndLocation pattern_and_location); - template = 0> + template static void info(PatternAndLocation pattern_and_location, ARGS &&...args); - template = 0> - static void info(PatternAndLocation pattern_and_location, ARGS &&...); + static void info(PatternAndLocation pattern_and_location); - template = 0> + template static void warn(PatternAndLocation pattern_and_location, ARGS &&...args); - template = 0> - static void warn(PatternAndLocation pattern_and_location, ARGS &&...); + static void warn(PatternAndLocation pattern_and_location); - template = 0> + template static void error(PatternAndLocation pattern_and_location, ARGS &&...args); - template = 0> - static void error(PatternAndLocation pattern_and_location, ARGS &&...); + static void error(PatternAndLocation pattern_and_location); /// Add log appender to global logger /// \param appender Log appender @@ -142,48 +138,28 @@ class Logger { */ extern Logger *getLogger() noexcept; -template = 0> +template void Logger::debug(PatternAndLocation pattern_and_location, ARGS &&...args) { auto message = text::fmt(pattern_and_location.pattern, std::forward(args)...); prelog(pattern_and_location, Level::DEBUG, message); } -template = 0> -void Logger::debug(PatternAndLocation pattern_and_location, ARGS &&...) { - prelog(pattern_and_location, Level::DEBUG, std::string(pattern_and_location.pattern)); -} - -template = 0> +template void Logger::info(PatternAndLocation pattern_and_location, ARGS &&...args) { auto message = text::fmt(pattern_and_location.pattern, std::forward(args)...); prelog(pattern_and_location, Level::INFO, message); } -template = 0> -void Logger::info(PatternAndLocation pattern_and_location, ARGS &&...) { - prelog(pattern_and_location, Level::INFO, std::string(pattern_and_location.pattern)); -} - -template = 0> +template void Logger::warn(PatternAndLocation pattern_and_location, ARGS &&...args) { auto message = text::fmt(pattern_and_location.pattern, std::forward(args)...); prelog(pattern_and_location, Level::WARN, message); } -template = 0> -void Logger::warn(PatternAndLocation pattern_and_location, ARGS &&...) { - prelog(pattern_and_location, Level::WARN, std::string(pattern_and_location.pattern)); -} - -template = 0> +template void Logger::error(PatternAndLocation pattern_and_location, ARGS &&...args) { auto message = text::fmt(pattern_and_location.pattern, std::forward(args)...); prelog(pattern_and_location, Level::ERR, message); } -template = 0> -void Logger::error(PatternAndLocation pattern_and_location, ARGS &&...) { - prelog(pattern_and_location, Level::ERR, std::string(pattern_and_location.pattern)); -} - } // namespace sese::record