...

common/adc_spdlog.h

@@ -20,28 +20,103 @@ protected:
     std::shared_ptr<spdlog::logger> _logger;
 
     void* _thisAddress;
+    std::string _currentPattern;
 
 public:
-    constexpr static char loggerDefaultFormat[] = "[%Y-%m-%d %T.%e] [%l]: [%v]";
+    constexpr static std::string_view LOGGER_DEFAULT_FORMAT = "[%Y-%m-%d %T.%e] [%l]: [%v]";
 
-    template <typename... BaseCtorArgTs>
+    template <traits::adc_input_char_range R, typename... BaseCtorArgTs>
-    AdcSpdlogGenericDecorator(std::shared_ptr<spdlog::logger> logger, BaseCtorArgTs&&... ctor_args)
+    AdcSpdlogGenericDecorator(const R& pattern, std::shared_ptr<spdlog::logger> logger, BaseCtorArgTs&&... ctor_args)
-        : BaseT(std::forward<BaseCtorArgTs>(ctor_args)...), _logger(logger), _thisAddress((void*)std::addressof(*this))
+        : BaseT(std::forward<BaseCtorArgTs>(ctor_args)...),
+          _logger(logger),
+          _thisAddress((void*)std::addressof(*this)),
+          _currentPattern(pattern.begin(), pattern.end())
     {
-        _logger->set_pattern(loggerDefaultFormat);
+        _logger->set_pattern(_currentPattern);
 
-        logMethodCalling("AdcSpdlogGenericDecorator");  // in debug
+        if (_logger->level() == spdlog::level::trace) {
-        logMethodCalling();                             // in trace
+            logMethodCalling(__PRETTY_FUNCTION__);  // in trace
+        } else {
+            logMethodCalling("AdcSpdlogGenericDecorator", __FUNCTION__);  // in debug
+        }
 
         _logger->debug("set logger with {}", loggerInfo());
     }
 
-    virtual ~AdcSpdlogGenericDecorator()
+
+    template <typename... BaseCtorArgTs>
+    AdcSpdlogGenericDecorator(std::shared_ptr<spdlog::logger> logger, BaseCtorArgTs&&... ctor_args)
+        : AdcSpdlogGenericDecorator(LOGGER_DEFAULT_FORMAT, logger, std::forward<BaseCtorArgTs>(ctor_args)...)
     {
-        //
-        logMethodCalling("AdcSpdlogGenericDecorator");  // in debug
     }
 
+    virtual ~AdcSpdlogGenericDecorator()
+    {
+        logMethodCalling("AdcSpdlogGenericDecorator", __FUNCTION__);  // in debug
+
+        _logger->flush();
+    }
+
+
+    template <traits::adc_input_char_range R>
+    void setPattern(const R& pattern)
+    {
+        logMethodCalling("AdcSpdlogGenericDecorator", __FUNCTION__);  // in debug
+
+        _currentPattern = {pattern.begin(), pattern.end()};
+
+        _logger->debug("set current logging pattern to: {}", _currentPattern);
+    }
+
+
+    std::string pattern() const
+    {
+        logMethodCalling();
+
+        return _currentPattern;
+    }
+
+    template <traits::formattable... ArgTs>
+    void logMsg(spdlog::level::level_enum level, std::string_view fmt, ArgTs&&... args)
+    {
+        _logger->log(level, fmt, std::forward<ArgTs>(args)...);
+    }
+
+    template <traits::formattable... ArgTs>
+    void logCritical(std::string_view fmt, ArgTs&&... args)
+    {
+        _logger->log(spdlog::level::critical, fmt, std::forward<ArgTs>(args)...);
+    }
+
+    template <traits::formattable... ArgTs>
+    void logError(std::string_view fmt, ArgTs&&... args)
+    {
+        _logger->log(spdlog::level::err, fmt, std::forward<ArgTs>(args)...);
+    }
+
+    template <traits::formattable... ArgTs>
+    void logWarn(std::string_view fmt, ArgTs&&... args)
+    {
+        _logger->log(spdlog::level::warn, fmt, std::forward<ArgTs>(args)...);
+    }
+
+    template <traits::formattable... ArgTs>
+    void logInfo(std::string_view fmt, ArgTs&&... args)
+    {
+        _logger->log(spdlog::level::info, fmt, std::forward<ArgTs>(args)...);
+    }
+
+    template <traits::formattable... ArgTs>
+    void logDebug(std::string_view fmt, ArgTs&&... args)
+    {
+        _logger->log(spdlog::level::debug, fmt, std::forward<ArgTs>(args)...);
+    }
+
+    template <traits::formattable... ArgTs>
+    void logTrace(std::string_view fmt, ArgTs&&... args)
+    {
+        _logger->log(spdlog::level::trace, fmt, std::forward<ArgTs>(args)...);
+    }
 
 protected:
     // format string must contain two formating specifications:
@@ -63,23 +138,49 @@ protected:
         return loggerInfo<std::string>("name [{}] and log-level [{}]");
     }
 
-    void logMethodCalling(spdlog::level::level_enum level = spdlog::level::trace) const
-    {
-        _logger->log(level, "call {} (this: {}, thread ID: {})", __PRETTY_FUNCTION__, _thisAddress,
-                     std::this_thread::get_id());
-    }
-
     void logMethodCalling(std::string_view class_name,
-                          spdlog::level::level_enum level = spdlog::level::debug,
+                          std::string_view method_name,
-                          std::string_view method_name = "") const
+                          spdlog::level::level_enum level = spdlog::level::debug) const
     {
-        if (method_name.empty()) {
-            method_name = __FUNCTION__;
-        }
-
         _logger->log(level, "call {}::{} (this: {}, thread ID: {})", class_name, method_name, _thisAddress,
                      std::this_thread::get_id());
     }
+
+
+    void logMethodCalling(std::string_view log_msg, spdlog::level::level_enum level = spdlog::level::debug) const
+    {
+        _logger->log(level, "call {} (this: {}, thread ID: {})", log_msg, _thisAddress, std::this_thread::get_id());
+    }
+};
+
+
+template <typename BaseT>
+class AdcSpdlogGenericMarkDecorator : public AdcSpdlogGenericDecorator<BaseT>
+{
+protected:
+    using base_t = AdcSpdlogGenericDecorator<BaseT>;
+
+public:
+    constexpr static std::array<std::string_view, 2> LOGGER_DEFAULT_FORMAT{"[%Y-%m-%d %T.%e] [%l]: ", "[%v]"};
+
+    template <traits::adc_input_char_range R, traits::adc_range_of_input_char_range IR>
+    static std::string constructPattern(const R& mark, size_t after_idx = 0, const IR& format = LOGGER_DEFAULT_FORMAT)
+    {
+        std::string pattern;
+
+        std::ranges::copy(format | std::views::take(after_idx + 1) | std::views::join, std::back_inserter(pattern));
+        std::ranges::copy(mark, std::back_inserter(pattern));
+        std::ranges::copy(format | std::views::drop(after_idx + 1) | std::views::join, std::back_inserter(pattern));
+
+        return pattern;
+    }
+
+
+    template <traits::adc_input_char_range R, typename... BaseCtorArgTs>
+    AdcSpdlogGenericMarkDecorator(const R& mark, std::shared_ptr<spdlog::logger> logger, BaseCtorArgTs&&... ctor_args)
+        : base_t(constructPattern(mark), logger, std::forward<BaseCtorArgTs>(ctor_args)...)
+    {
+    }
 };
 
 

common/adc_traits.h

@@ -50,6 +50,10 @@ template <typename R>
 concept adc_range_of_view_char_range = std::ranges::range<R> && std::ranges::view<std::ranges::range_value_t<R>> &&
                                        std::same_as<std::ranges::range_value_t<std::ranges::range_value_t<R>>, char>;
 
+template <typename R>
+concept adc_range_of_input_char_range =
+    std::ranges::range<R> && traits::adc_input_char_range<std::ranges::range_value_t<R>>;
+
 // deduce returned type of callable
 // template <typename T>
 // using adc_retval_t = std::invoke_result_t<std::remove_cvref_t<T>>;

net/adc_netserver_spdlog.h

@@ -11,9 +11,9 @@ ABSTRACT DEVICE COMPONENTS LIBRARY
 
 #ifdef USE_SPDLOG_LIBRARY
 
-#include <spdlog/logger.h>
+#include "../common/adc_spdlog.h"
-
 #include "../common/adc_traits.h"
+
 #include "adc_netserver.h"
 
 namespace adc
@@ -89,38 +89,38 @@ public:
 
 
 template <traits::adc_netserver_c ServerT>
-class AdcNetServerSpdlogDecorator : public ServerT
+class AdcNetServerSpdlogDecorator : public AdcSpdlogGenericDecorator<ServerT>
 {
 protected:
-    std::shared_ptr<spdlog::logger> _logger;
+    using base_t = AdcSpdlogGenericDecorator<ServerT>;
 
-    void* _thisAddress;
     std::string _serverID;
 
 public:
+    using base_t::logCritical;
+    using base_t::logDebug;
+    using base_t::logError;
+    using base_t::logInfo;
+    using base_t::logMsg;
+    using base_t::logWarn;
+
     using typename ServerT::server_ident_t;
 
     template <typename... ImplCtorArgTs>
     AdcNetServerSpdlogDecorator(std::shared_ptr<spdlog::logger> logger, ImplCtorArgTs&&... ctor_args)
-        : ServerT(std::forward<ImplCtorArgTs>(ctor_args)...), _logger(logger), _thisAddress((void*)std::addressof(this))
+        : base_t(logger, std::forward<ImplCtorArgTs>(ctor_args)...)
     {
         fmt::format_to(std::back_inserter(_serverID), "{}", ServerT::serverIdent());
 
-        _logger->trace("Call AdcNetServerSpdlogDecorator::AdcNetServerSpdlogDecorator (this: {})", _thisAddress);
+        logDebug("Creating network server with ID = [{}] (ADDR = {})", _serverID, this->_thisAddress);
-
-        _logger->debug("Creating network server session with ID = [{}] (ADDR = {})", _serverID, _thisAddress);
-        _logger->debug("use logger with name [{}] and level [{}]", _logger->name(),
-                       spdlog::level::to_string_view(_logger->level()));
     }
 
 
     virtual ~AdcNetServerSpdlogDecorator()
     {
-        _logger->trace("Call AdcNetServerSpdlogDecorator::~AdcNetServerSpdlogDecorator (this: {})", _thisAddress);
+        this->logMethodCalling();
 
-        _logger->debug("Deleting network server with ID = [{}] (ADDR = {})", _serverID, _thisAddress);
+        logDebug("Deleting network server with ID = [{}] (ADDR = {})", _serverID, this->_thisAddress);
-
-        _logger->flush();
     }
 
 
@@ -132,16 +132,19 @@ public:
 
     virtual void start()
     {
-        _logger->trace("Call AdcNetServerSpdlogDecorator::start (this: {})", _thisAddress);
+        this->logMethodCalling();
 
-        _logger->info("Starting network server with ID = [{}] (ADDR = {})", _serverID, _thisAddress);
+        logInfo("Starting network server");
 
         ServerT::start();
     };
 
     virtual void stop()
     {
-        //
+        this->logMethodCalling();
+
+        logInfo("Stopping network server");
+
         ServerT::stop();
     };
 };