refactor(Logger): simplify logging methods and remove redundant overl…

…oads
libsese · Jan 7, 2025 · 835edde · 835edde
1 parent e9ed53c
commit 835edde
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 36 deletions.
diff --git 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
@@ -95,29 +95,25 @@ class Logger {
         }
     };
 
-    template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) != 0, int> = 0>
+    template<typename... ARGS>
     static void debug(PatternAndLocation pattern_and_location, ARGS &&...args);
 
-    template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) == 0, int> = 0>
-    static void debug(PatternAndLocation pattern_and_location, ARGS &&...);
+    static void debug(PatternAndLocation pattern_and_location);
 
-    template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) != 0, int> = 0>
+    template<typename... ARGS>
     static void info(PatternAndLocation pattern_and_location, ARGS &&...args);
 
-    template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) == 0, int> = 0>
-    static void info(PatternAndLocation pattern_and_location, ARGS &&...);
+    static void info(PatternAndLocation pattern_and_location);
 
-    template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) != 0, int> = 0>
+    template<typename... ARGS>
     static void warn(PatternAndLocation pattern_and_location, ARGS &&...args);
 
-    template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) == 0, int> = 0>
-    static void warn(PatternAndLocation pattern_and_location, ARGS &&...);
+    static void warn(PatternAndLocation pattern_and_location);
 
-    template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) != 0, int> = 0>
+    template<typename... ARGS>
     static void error(PatternAndLocation pattern_and_location, ARGS &&...args);
 
-    template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) == 0, int> = 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<typename... ARGS, std::enable_if_t<sizeof...(ARGS) != 0, int> = 0>
+template<typename... ARGS>
 void Logger::debug(PatternAndLocation pattern_and_location, ARGS &&...args) {
     auto message = text::fmt(pattern_and_location.pattern, std::forward<ARGS>(args)...);
     prelog(pattern_and_location, Level::DEBUG, message);
 }
 
-template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) == 0, int> = 0>
-void Logger::debug(PatternAndLocation pattern_and_location, ARGS &&...) {
-    prelog(pattern_and_location, Level::DEBUG, std::string(pattern_and_location.pattern));
-}
-
-template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) != 0, int> = 0>
+template<typename... ARGS>
 void Logger::info(PatternAndLocation pattern_and_location, ARGS &&...args) {
     auto message = text::fmt(pattern_and_location.pattern, std::forward<ARGS>(args)...);
     prelog(pattern_and_location, Level::INFO, message);
 }
 
-template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) == 0, int> = 0>
-void Logger::info(PatternAndLocation pattern_and_location, ARGS &&...) {
-    prelog(pattern_and_location, Level::INFO, std::string(pattern_and_location.pattern));
-}
-
-template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) != 0, int> = 0>
+template<typename... ARGS>
 void Logger::warn(PatternAndLocation pattern_and_location, ARGS &&...args) {
     auto message = text::fmt(pattern_and_location.pattern, std::forward<ARGS>(args)...);
     prelog(pattern_and_location, Level::WARN, message);
 }
 
-template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) == 0, int> = 0>
-void Logger::warn(PatternAndLocation pattern_and_location, ARGS &&...) {
-    prelog(pattern_and_location, Level::WARN, std::string(pattern_and_location.pattern));
-}
-
-template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) != 0, int> = 0>
+template<typename... ARGS>
 void Logger::error(PatternAndLocation pattern_and_location, ARGS &&...args) {
     auto message = text::fmt(pattern_and_location.pattern, std::forward<ARGS>(args)...);
     prelog(pattern_and_location, Level::ERR, message);
 }
 
-template<typename... ARGS, std::enable_if_t<sizeof...(ARGS) == 0, int> = 0>
-void Logger::error(PatternAndLocation pattern_and_location, ARGS &&...) {
-    prelog(pattern_and_location, Level::ERR, std::string(pattern_and_location.pattern));
-}
-
 } // namespace sese::record