This commit is contained in:
Timur A. Fatkhullin
2024-11-12 01:00:22 +03:00
parent 6acc1f94ba
commit 9769c24005
6 changed files with 48 additions and 15 deletions

View File

@@ -23,7 +23,7 @@ protected:
std::string _currentPattern;
public:
constexpr static std::string_view LOGGER_DEFAULT_FORMAT = "[%Y-%m-%d %T.%e] [%l]: [%v]";
constexpr static std::string_view LOGGER_DEFAULT_FORMAT = "[%Y-%m-%d %T.%e] [%l]: %v";
template <traits::adc_input_char_range R, typename... BaseCtorArgTs>
AdcSpdlogGenericDecorator(const R& pattern, std::shared_ptr<spdlog::logger> logger, BaseCtorArgTs&&... ctor_args)
@@ -161,7 +161,7 @@ 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]"};
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)
@@ -169,7 +169,9 @@ public:
std::string pattern;
std::ranges::copy(format | std::views::take(after_idx + 1) | std::views::join, std::back_inserter(pattern));
std::ranges::copy(std::string_view("["), std::back_inserter(pattern));
std::ranges::copy(mark, std::back_inserter(pattern));
std::ranges::copy(std::string_view("]: "), std::back_inserter(pattern));
std::ranges::copy(format | std::views::drop(after_idx + 1) | std::views::join, std::back_inserter(pattern));
return pattern;