timur/ADC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back to C++20 standard!

Browse Source 
Logging is worked (AdcOstreamLogger and AdcSPDLOGLogger classes)
This commit is contained in:
Timur A. Fatkhullin
2024-11-14 18:33:07 +03:00
parent 05e0055193
commit 78a9e53d18
9 changed files with 334 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
common/adc_spdlog.h
View File

@@ -19,15 +19,16 @@ namespace adc
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";
// [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)
template <traits::adc_input_char_range R = decltype(LOGGER_DEFAULT_FORMAT)>
AdcSPDLOGLogger(std::shared_ptr<spdlog::logger> logger, const R& pattern = LOGGER_DEFAULT_FORMAT)
: _loggerSPtr(logger), _currentLogPattern()
{
std::ranges::copy(pattern, std::back_inserter(_currentLogPattern));
_loggerSPtr->set_pattern(_currentLogPattern);
}
@@ -45,45 +46,81 @@ public:
return _loggerSPtr->level();
}
void logMessage(loglevel_t level, std::string_view fmt, traits::formattable auto&&... args)
void logMessage(loglevel_t level, const std::string& msg)
{
_loggerSPtr->log(level, fmt, std::forward<decltype(args)>(args)...);
_loggerSPtr->log(level, msg);
}
// specialized for given level methods
void logCritical(std::string_view fmt, traits::formattable auto&&... args)
void logCritical(const std::string& msg)
{
logMessage(spdlog::level::critical, fmt, std::forward<decltype(args)>(args)...);
logMessage(spdlog::level::critical, msg);
}
void logError(std::string_view fmt, traits::formattable auto&&... args)
void logError(const std::string& msg)
{
logMessage(spdlog::level::err, fmt, std::forward<decltype(args)>(args)...);
logMessage(spdlog::level::err, msg);
}
void logWarn(std::string_view fmt, traits::formattable auto&&... args)
void logWarn(const std::string& msg)
{
logMessage(spdlog::level::warn, fmt, std::forward<decltype(args)>(args)...);
logMessage(spdlog::level::warn, msg);
}
void logInfo(std::string_view fmt, traits::formattable auto&&... args)
void logInfo(const std::string& msg)
{
logMessage(spdlog::level::info, fmt, std::forward<decltype(args)>(args)...);
logMessage(spdlog::level::info, msg);
}
void logDebug(std::string_view fmt, traits::formattable auto&&... args)
void logDebug(const std::string& msg)
{
logMessage(spdlog::level::debug, fmt, std::forward<decltype(args)>(args)...);
logMessage(spdlog::level::debug, msg);
}
void logTrace(std::string_view fmt, traits::formattable auto&&... args)
void logTrace(const std::string& msg)
{
logMessage(spdlog::level::trace, fmt, std::forward<decltype(args)>(args)...);
logMessage(spdlog::level::trace, msg);
}
template <traits::formattable... ArgTs>
void logCritical(std::format_string<ArgTs...> fmt, ArgTs&&... args)
{
_loggerSPtr->log(spdlog::level::critical, fmt, std::forward<ArgTs>(args)...);
}
template <traits::formattable... ArgTs>
void logError(std::format_string<ArgTs...> fmt, ArgTs&&... args)
{
_loggerSPtr->log(spdlog::level::err, fmt, std::forward<ArgTs>(args)...);
}
template <traits::formattable... ArgTs>
void logWarn(std::format_string<ArgTs...> fmt, ArgTs&&... args)
{
_loggerSPtr->log(spdlog::level::warn, fmt, std::forward<ArgTs>(args)...);
}
template <traits::formattable... ArgTs>
void logInfo(std::format_string<ArgTs...> fmt, ArgTs&&... args)
{
_loggerSPtr->log(spdlog::level::info, fmt, std::forward<ArgTs>(args)...);
}
template <traits::formattable... ArgTs>
void logDebug(std::format_string<ArgTs...> fmt, ArgTs&&... args)
{
_loggerSPtr->log(spdlog::level::debug, fmt, std::forward<ArgTs>(args)...);
}
template <traits::formattable... ArgTs>
void logTrace(std::format_string<ArgTs...> fmt, ArgTs&&... args)
{
_loggerSPtr->log(spdlog::level::trace, fmt, std::forward<ArgTs>(args)...);
}
protected:
static constexpr size_t LOGGER_DEFAULT_FORMAT_MARK_POS = 21;
static constexpr size_t LOGGER_DEFAULT_FORMAT_MARK_POS = 20;
std::string _currentLogPattern;
std::shared_ptr<spdlog::logger> _loggerSPtr;

39
common/adc_utils.h
View File

@@ -7,6 +7,7 @@
#include <mutex>
#include <ranges>
#include <regex>
#include <thread>
#include <utility>
#include "../common/adc_traits.h"
@@ -453,6 +454,7 @@ namespace constants
{
static constexpr char DEFAULT_CONVERTER_DELIMITER[] = " ";
static constexpr char DEFAULT_CONVERTER_DELIMITER_COMA[] = ", ";
} // namespace constants
@@ -676,6 +678,17 @@ static constexpr size_t AdcFNV1aHash(const R& r)
return hash;
}
/* current thread ID std::string representation */
static std::string AdcThisThreadId()
{
std::stringstream st;
st << std::this_thread::get_id();
return st.str();
}
/* std::basic_ostream based multithread-safe simple logger */
template <typename CharT = char, typename CharTraitsT = std::char_traits<CharT>>
@@ -709,43 +722,37 @@ public:
return _currentLogLevel;
}
template <traits::formattable... Ts>
void logMessage(loglevel_t level, std::string_view fmt, Ts&&... args)
void logMessage(loglevel_t level, const std::string& msg)
{
std::lock_guard<std::mutex> lock(_logMutex);
if (_currentLogLevel < level)
return;
std::string s;
std::format_to(std::back_inserter(s), fmt, std::forward<Ts>(args)...);
const std::time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
// format log-message in form:
// [YYYY-MM-DD HH:MM:SS][level] log-message
//
_logStream << std::put_time(std::localtime(&now), "[%F %T]") << "[" << LOGLEVEL_MARK[_currentLogLevel] << "] "
<< s;
_logStream << std::put_time(std::localtime(&now), "[%F %T]") << "[" << LOGLEVEL_MARK[level] << "] " << msg
<< "\n"
<< std::flush;
}
template <traits::formattable... Ts>
void logError(std::string_view fmt, Ts&&... args)
void logError(const std::string& msg)
{
logMessage(ERROR_LEVEL, fmt, std::forward<Ts>(args)...);
logMessage(ERROR_LEVEL, msg);
}
template <traits::formattable... Ts>
void logInfo(std::string_view fmt, Ts&&... args)
void logInfo(const std::string& msg)
{
logMessage(INFO_LEVEL, fmt, std::forward<Ts>(args)...);
logMessage(INFO_LEVEL, msg);
}
template <traits::formattable... Ts>
void logDebug(std::string_view fmt, Ts&&... args)
void logDebug(const std::string& msg)
{
logMessage(DEBUG_LEVEL, fmt, std::forward<Ts>(args)...);
logMessage(DEBUG_LEVEL, msg);
}