diff --git a/include/spdlog/async_logger.h b/include/spdlog/async_logger.h index 8b492657..9d7e08fa 100644 --- a/include/spdlog/async_logger.h +++ b/include/spdlog/async_logger.h @@ -71,7 +71,7 @@ public: protected: void _sink_it(details::log_msg& msg) override; void _set_formatter(spdlog::formatter_ptr msg_formatter) override; - void _set_pattern(const std::string& pattern) override; + void _set_pattern(const std::string& pattern, pattern_time_type pattern_time) override; private: std::unique_ptr _async_log_helper; diff --git a/include/spdlog/common.h b/include/spdlog/common.h index 14d5d149..994e847d 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -106,6 +106,15 @@ enum class async_overflow_policy discard_log_msg // Discard the message it enqueue fails }; +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // use variant of time similar to std::localtime for std::tm + utc // use variant of time similar to std::gmtime for std::tm +}; // // Log exception diff --git a/include/spdlog/details/async_logger_impl.h b/include/spdlog/details/async_logger_impl.h index 0b815f01..6822cd5b 100644 --- a/include/spdlog/details/async_logger_impl.h +++ b/include/spdlog/details/async_logger_impl.h @@ -76,9 +76,9 @@ inline void spdlog::async_logger::_set_formatter(spdlog::formatter_ptr msg_forma _async_log_helper->set_formatter(_formatter); } -inline void spdlog::async_logger::_set_pattern(const std::string& pattern) +inline void spdlog::async_logger::_set_pattern(const std::string& pattern, pattern_time_type pattern_time) { - _formatter = std::make_shared(pattern); + _formatter = std::make_shared(pattern, pattern_time); _async_log_helper->set_formatter(_formatter); } diff --git a/include/spdlog/details/logger_impl.h b/include/spdlog/details/logger_impl.h index a196a957..c6aa125b 100644 --- a/include/spdlog/details/logger_impl.h +++ b/include/spdlog/details/logger_impl.h @@ -53,9 +53,9 @@ inline void spdlog::logger::set_formatter(spdlog::formatter_ptr msg_formatter) _set_formatter(msg_formatter); } -inline void spdlog::logger::set_pattern(const std::string& pattern) +inline void spdlog::logger::set_pattern(const std::string& pattern, pattern_time_type pattern_time) { - _set_pattern(pattern); + _set_pattern(pattern, pattern_time); } @@ -316,9 +316,9 @@ inline void spdlog::logger::_sink_it(details::log_msg& msg) flush(); } -inline void spdlog::logger::_set_pattern(const std::string& pattern) +inline void spdlog::logger::_set_pattern(const std::string& pattern, pattern_time_type pattern_time) { - _formatter = std::make_shared(pattern); + _formatter = std::make_shared(pattern, pattern_time); } inline void spdlog::logger::_set_formatter(formatter_ptr msg_formatter) { diff --git a/include/spdlog/details/pattern_formatter_impl.h b/include/spdlog/details/pattern_formatter_impl.h index 8c096150..81835618 100644 --- a/include/spdlog/details/pattern_formatter_impl.h +++ b/include/spdlog/details/pattern_formatter_impl.h @@ -324,7 +324,6 @@ class T_formatter SPDLOG_FINAL:public flag_formatter } }; - // ISO 8601 offset from UTC in timezone (+-HH:MM) class z_formatter SPDLOG_FINAL:public flag_formatter { @@ -495,7 +494,8 @@ class full_formatter SPDLOG_FINAL:public flag_formatter /////////////////////////////////////////////////////////////////////////////// // pattern_formatter inline impl /////////////////////////////////////////////////////////////////////////////// -inline spdlog::pattern_formatter::pattern_formatter(const std::string& pattern) +inline spdlog::pattern_formatter::pattern_formatter(const std::string& pattern, pattern_time_type pattern_time) +: _pattern_time(pattern_time) { compile_pattern(pattern); } @@ -665,12 +665,19 @@ inline void spdlog::pattern_formatter::handle_flag(char flag) } } +inline std::tm spdlog::pattern_formatter::get_time(details::log_msg& msg) +{ + if (_pattern_time == pattern_time_type::local) + return details::os::localtime(log_clock::to_time_t(msg.time)); + else + return details::os::gmtime(log_clock::to_time_t(msg.time)); +} inline void spdlog::pattern_formatter::format(details::log_msg& msg) { #ifndef SPDLOG_NO_DATETIME - auto tm_time = details::os::localtime(log_clock::to_time_t(msg.time)); + auto tm_time = get_time(msg); #else std::tm tm_time; #endif diff --git a/include/spdlog/formatter.h b/include/spdlog/formatter.h index 337ca596..6bba9025 100644 --- a/include/spdlog/formatter.h +++ b/include/spdlog/formatter.h @@ -29,13 +29,15 @@ class pattern_formatter SPDLOG_FINAL : public formatter { public: - explicit pattern_formatter(const std::string& pattern); + explicit pattern_formatter(const std::string& pattern, pattern_time_type pattern_time = pattern_time_type::local); pattern_formatter(const pattern_formatter&) = delete; pattern_formatter& operator=(const pattern_formatter&) = delete; void format(details::log_msg& msg) override; private: const std::string _pattern; + const pattern_time_type _pattern_time; std::vector> _formatters; + std::tm get_time(details::log_msg& msg); void handle_flag(char flag); void compile_pattern(const std::string& pattern); }; diff --git a/include/spdlog/logger.h b/include/spdlog/logger.h index da2d8e41..fce99f9a 100644 --- a/include/spdlog/logger.h +++ b/include/spdlog/logger.h @@ -66,7 +66,7 @@ public: void set_level(level::level_enum); level::level_enum level() const; const std::string& name() const; - void set_pattern(const std::string&); + void set_pattern(const std::string&, pattern_time_type = pattern_time_type::local); void set_formatter(formatter_ptr); // automatically call flush() if message level >= log_level @@ -82,7 +82,7 @@ public: protected: virtual void _sink_it(details::log_msg&); - virtual void _set_pattern(const std::string&); + virtual void _set_pattern(const std::string&, pattern_time_type); virtual void _set_formatter(formatter_ptr); // default error handler: print the error to stderr with the max rate of 1 message/minute