Commit 4f9b4d01 authored by gabime's avatar gabime

fixed bug in extra formatting done in async mode

parent 30326dad
...@@ -72,6 +72,6 @@ inline void spdlog::async_logger::_set_pattern(const std::string& pattern) ...@@ -72,6 +72,6 @@ inline void spdlog::async_logger::_set_pattern(const std::string& pattern)
inline void spdlog::async_logger::_sink_it(details::log_msg& msg) inline void spdlog::async_logger::_sink_it(details::log_msg& msg)
{ {
_async_log_helper->log(msg); _async_log_helper->log(msg);
} }
...@@ -65,8 +65,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* fmt, const Ar ...@@ -65,8 +65,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* fmt, const Ar
{ {
throw spdlog::spdlog_ex(std::string("format error in \"") + fmt + "\": " + ex.what()); throw spdlog::spdlog_ex(std::string("format error in \"") + fmt + "\": " + ex.what());
} }
_formatter->format(log_msg);
_sink_it(log_msg); _sink_it(log_msg);
} }
...@@ -78,7 +77,6 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* msg) ...@@ -78,7 +77,6 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* msg)
details::log_msg log_msg(&_name, lvl); details::log_msg log_msg(&_name, lvl);
log_msg.raw << msg; log_msg.raw << msg;
_formatter->format(log_msg);
_sink_it(log_msg); _sink_it(log_msg);
} }
...@@ -89,8 +87,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const T& msg) ...@@ -89,8 +87,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const T& msg)
if (!should_log(lvl)) return; if (!should_log(lvl)) return;
details::log_msg log_msg(&_name, lvl); details::log_msg log_msg(&_name, lvl);
log_msg.raw << msg; log_msg.raw << msg;
_formatter->format(log_msg);
_sink_it(log_msg); _sink_it(log_msg);
} }
...@@ -208,6 +205,7 @@ inline bool spdlog::logger::should_log(spdlog::level::level_enum msg_level) cons ...@@ -208,6 +205,7 @@ inline bool spdlog::logger::should_log(spdlog::level::level_enum msg_level) cons
// //
inline void spdlog::logger::_sink_it(details::log_msg& msg) inline void spdlog::logger::_sink_it(details::log_msg& msg)
{ {
_formatter->format(msg);
for (auto &sink : _sinks) for (auto &sink : _sinks)
sink->log(msg); sink->log(msg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment