From 05e00551930735ea223f799c1a44d5ae50cc18d5 Mon Sep 17 00:00:00 2001
From: "Timur A. Fatkhullin" <timur@sao.ru>
Date: Wed, 13 Nov 2024 18:01:31 +0300
Subject: [PATCH] ...

---
 common/adc_spdlog.h    | 97 +++++++++++++++++++++++++++++++++++++++++-
 common/adc_utils.h     |  4 +-
 net/adc_net_concepts.h |  3 ++
 3 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/common/adc_spdlog.h b/common/adc_spdlog.h
index e76b9a3..09f17df 100644
--- a/common/adc_spdlog.h
+++ b/common/adc_spdlog.h
@@ -13,6 +13,101 @@
 namespace adc
 {
 
+
+/*  SPDLOG-library based advanced single/multithreaded logger  */
+
+class AdcSPDLOGLogger
+{
+public:
+    // [year-month-day time.millisecs] [log-level]: log-message
+    constexpr static std::string_view LOGGER_DEFAULT_FORMAT = "[%Y-%m-%d %T.%e] [%l]: %v";
+
+    typedef spdlog::level::level_enum loglevel_t;
+
+    AdcSPDLOGLogger(std::shared_ptr<spdlog::logger> logger,
+                    const traits::adc_input_char_range auto& pattern = LOGGER_DEFAULT_FORMAT)
+        : _loggerSPtr(logger), _currentLogPattern(pattern)
+    {
+        _loggerSPtr->set_pattern(_currentLogPattern);
+    }
+
+
+    virtual ~AdcSPDLOGLogger() = default;
+
+
+    void setLogLevel(loglevel_t log_level)
+    {
+        _loggerSPtr->set_level(log_level);
+    }
+
+    loglevel_t getLogLevel() const
+    {
+        return _loggerSPtr->level();
+    }
+
+    void logMessage(loglevel_t level, std::string_view fmt, traits::formattable auto&&... args)
+    {
+        _loggerSPtr->log(level, fmt, std::forward<decltype(args)>(args)...);
+    }
+
+    // specialized for given level methods
+
+    void logCritical(std::string_view fmt, traits::formattable auto&&... args)
+    {
+        logMessage(spdlog::level::critical, fmt, std::forward<decltype(args)>(args)...);
+    }
+
+    void logError(std::string_view fmt, traits::formattable auto&&... args)
+    {
+        logMessage(spdlog::level::err, fmt, std::forward<decltype(args)>(args)...);
+    }
+
+    void logWarn(std::string_view fmt, traits::formattable auto&&... args)
+    {
+        logMessage(spdlog::level::warn, fmt, std::forward<decltype(args)>(args)...);
+    }
+
+    void logInfo(std::string_view fmt, traits::formattable auto&&... args)
+    {
+        logMessage(spdlog::level::info, fmt, std::forward<decltype(args)>(args)...);
+    }
+
+    void logDebug(std::string_view fmt, traits::formattable auto&&... args)
+    {
+        logMessage(spdlog::level::debug, fmt, std::forward<decltype(args)>(args)...);
+    }
+
+    void logTrace(std::string_view fmt, traits::formattable auto&&... args)
+    {
+        logMessage(spdlog::level::trace, fmt, std::forward<decltype(args)>(args)...);
+    }
+
+protected:
+    static constexpr size_t LOGGER_DEFAULT_FORMAT_MARK_POS = 21;
+
+    std::string _currentLogPattern;
+    std::shared_ptr<spdlog::logger> _loggerSPtr;
+
+
+    // helper method
+    void addMarkToPattern(traits::adc_input_char_range auto& mark, size_t pos = LOGGER_DEFAULT_FORMAT_MARK_POS)
+    {
+        std::string ptrn = _currentLogPattern.substr(0, pos);
+
+        ptrn += " [";
+        std::ranges::copy(mark, std::back_inserter(ptrn));
+        ptrn += "] ";
+
+        std::ranges::copy(_currentLogPattern | std::views::drop(pos), std::back_inserter(ptrn));
+
+        _currentLogPattern = ptrn;
+
+        _loggerSPtr->set_pattern(_currentLogPattern);
+    }
+};
+
+
+
 template <typename BaseT>
 class AdcSpdlogGenericDecorator : public BaseT
 {
@@ -77,7 +172,7 @@ public:
     }
 
     template <traits::formattable... ArgTs>
-    void logMsg(spdlog::level::level_enum level, std::string_view fmt, ArgTs&&... args)
+    void logMessage(spdlog::level::level_enum level, std::string_view fmt, ArgTs&&... args)
     {
         _logger->log(level, fmt, std::forward<ArgTs>(args)...);
     }
diff --git a/common/adc_utils.h b/common/adc_utils.h
index b4693cf..b31e9ee 100644
--- a/common/adc_utils.h
+++ b/common/adc_utils.h
@@ -686,7 +686,7 @@ public:
     typedef CharTraitsT char_traits_t;
 
     enum loglevel_t { NULL_LEVEL, ERROR_LEVEL, INFO_LEVEL, DEBUG_LEVEL };
-    static constexpr std::array logLevelMark{"null", "error", "info", "debug"};
+    static constexpr std::array LOGLEVEL_MARK{"null", "error", "info", "debug"};
 
     AdcOstreamLogger(std::basic_ostream<CharT, CharTraitsT>& stream = std::cout, loglevel_t log_level = INFO_LEVEL)
         : _logStream(stream), _currentLogLevel(log_level)
@@ -725,7 +725,7 @@ public:
         // format log-message in form:
         //    [YYYY-MM-DD HH:MM:SS][level] log-message
         //
-        _logStream << std::put_time(std::localtime(&now), "[%F %T]") << "[" << logLevelMark[_currentLogLevel] << "] "
+        _logStream << std::put_time(std::localtime(&now), "[%F %T]") << "[" << LOGLEVEL_MARK[_currentLogLevel] << "] "
                    << s;
     }
 
diff --git a/net/adc_net_concepts.h b/net/adc_net_concepts.h
index fcbf4d0..f5a6eda 100644
--- a/net/adc_net_concepts.h
+++ b/net/adc_net_concepts.h
@@ -236,6 +236,9 @@ concept adc_logger_c = requires(LOGGERT log, const LOGGERT log_const) {
     // logging method signature:
     //     void method(std::string_view fmt, traits::formattable auto&& args...)
 
+    log.logMessage(std::declval<typename LOGGERT::loglevel_t>(), std::declval<std::string_view>());
+    log.logMessage(std::declval<typename LOGGERT::loglevel_t>(), std::declval<std::string_view>(),
+                   std::declval<std::string>());
 
     // logging method must accept at least the single argument - formatting string
     log.logInfo(std::declval<std::string_view>());