removed set_pattern from logger

pull/2143/head
gabime 4 years ago
parent 59d1d8e5ab
commit c716aa2ef2

@ -24,6 +24,7 @@ void udp_example();
void custom_flags_example(); void custom_flags_example();
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"
#include "spdlog/default_formatter.h"
#include "spdlog/pattern_formatter.h" #include "spdlog/pattern_formatter.h"
#include "spdlog/cfg/env.h" // support for loading levels from the environment variable #include "spdlog/cfg/env.h" // support for loading levels from the environment variable
#include "spdlog/fmt/ostr.h" // support for user defined types #include "spdlog/fmt/ostr.h" // support for user defined types
@ -50,7 +51,8 @@ int main(int, char *[])
// Customize msg format for all loggers // Customize msg format for all loggers
spdlog::set_pattern("[%H:%M:%S %z] [%^%L%$] [thread %t] %v"); spdlog::set_pattern("[%H:%M:%S %z] [%^%L%$] [thread %t] %v");
spdlog::info("This an info message with custom format"); spdlog::info("This an info message with custom format");
spdlog::set_pattern("%+"); // back to default format using spdlog::details::make_unique; // for pre c++14
spdlog::set_formatter(make_unique<spdlog::default_formatter>()); // back to default format
spdlog::set_level(spdlog::level::info); spdlog::set_level(spdlog::level::info);
// Backtrace support // Backtrace support

@ -290,7 +290,6 @@ public:
// set formatting for the sinks in this logger. // set formatting for the sinks in this logger.
// each sink will get a separate instance of the formatter object. // each sink will get a separate instance of the formatter object.
void set_formatter(std::unique_ptr<formatter> f); void set_formatter(std::unique_ptr<formatter> f);
void set_pattern(std::string pattern);
// backtrace support. // backtrace support.
// efficiently store all debug/trace messages in a circular buffer until needed for debugging. // efficiently store all debug/trace messages in a circular buffer until needed for debugging.

@ -1294,8 +1294,8 @@ SPDLOG_INLINE void set_pattern(std::string pattern)
set_formatter(details::make_unique<pattern_formatter>(std::move(pattern))); set_formatter(details::make_unique<pattern_formatter>(std::move(pattern)));
} }
SPDLOG_INLINE void logger::set_pattern(std::string pattern) SPDLOG_INLINE void set_pattern(logger& logger, std::string pattern)
{ {
this->set_formatter(details::make_unique<pattern_formatter>(std::move(pattern))); logger.set_formatter(details::make_unique<pattern_formatter>(std::move(pattern)));
} }
} // namespace spdlog } // namespace spdlog

@ -118,6 +118,11 @@ private:
void compile_pattern_(const std::string &pattern); void compile_pattern_(const std::string &pattern);
}; };
// Set global log pattern.
SPDLOG_API void set_pattern(std::string pattern);
// set pattern to logger
SPDLOG_API void set_pattern(logger& logger, std::string pattern);
} // namespace spdlog } // namespace spdlog

@ -53,11 +53,9 @@ SPDLOG_API std::shared_ptr<logger> get(const std::string &name);
// Set global formatter. Each sink in each logger will get a clone of this object // Set global formatter. Each sink in each logger will get a clone of this object
// example: spdlog::set_formatter(std::make_unique<spdlog::pattern_formatter>("%Y-%m-%d %H:%M:%S.%e %l : %v")); // example: spdlog::set_formatter(std::make_unique<spdlog::pattern_formatter>("%Y-%m-%d %H:%M:%S.%e %l : %v"));
// Note: to use spdlog::set_pattern(format_string) include the "spdlog/pattern_formatter.h" file.
SPDLOG_API void set_formatter(std::unique_ptr<spdlog::formatter> formatter); SPDLOG_API void set_formatter(std::unique_ptr<spdlog::formatter> formatter);
// Set global log pattern.
SPDLOG_API void set_pattern(std::string pattern);
// enable global backtrace support // enable global backtrace support
SPDLOG_API void enable_backtrace(size_t n_messages); SPDLOG_API void enable_backtrace(size_t n_messages);

@ -278,7 +278,7 @@ TEST_CASE("clone-default-formatter", "[pattern_formatter]")
TEST_CASE("clone-default-formatter2", "[pattern_formatter]") TEST_CASE("clone-default-formatter2", "[pattern_formatter]")
{ {
auto formatter_1 = std::make_shared<spdlog::pattern_formatter>("%+"); auto formatter_1 = std::make_shared<spdlog::default_formatter>();
auto formatter_2 = formatter_1->clone(); auto formatter_2 = formatter_1->clone();
std::string logger_name = "test"; std::string logger_name = "test";
spdlog::details::log_msg msg(logger_name, spdlog::level::info, "some message"); spdlog::details::log_msg msg(logger_name, spdlog::level::info, "some message");

@ -84,7 +84,6 @@ TEST_CASE("stderr_color_mt", "[stderr]")
TEST_CASE("wchar_api", "[stdout]") TEST_CASE("wchar_api", "[stdout]")
{ {
auto l = spdlog::stdout_logger_st("wchar_logger"); auto l = spdlog::stdout_logger_st("wchar_logger");
l->set_pattern("%+");
l->set_level(spdlog::level::trace); l->set_level(spdlog::level::trace);
l->trace(L"Test wchar_api"); l->trace(L"Test wchar_api");
l->trace(L"Test wchar_api {}", L"param"); l->trace(L"Test wchar_api {}", L"param");

Loading…
Cancel
Save