1
0
mirror of https://github.com/gabime/spdlog.git synced 2025-04-01 02:42:41 +08:00

code formatting

This commit is contained in:
gabime 2018-07-23 00:13:52 +03:00
parent fe73255452
commit 33329c80a9
7 changed files with 55 additions and 54 deletions

View File

@ -37,7 +37,6 @@ inline spdlog::logger::logger(std::string logger_name, spdlog::sink_ptr single_s
inline spdlog::logger::~logger() = default; inline spdlog::logger::~logger() = default;
inline void spdlog::logger::set_formatter(std::unique_ptr<spdlog::formatter> f) inline void spdlog::logger::set_formatter(std::unique_ptr<spdlog::formatter> f)
{ {
for (auto &sink : sinks_) for (auto &sink : sinks_)

View File

@ -75,7 +75,7 @@ static int to12h(const tm &t)
} }
// Abbreviated weekday name // Abbreviated weekday name
static const char* days[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; static const char *days[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
class a_formatter : public flag_formatter class a_formatter : public flag_formatter
{ {
void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
@ -85,7 +85,7 @@ class a_formatter : public flag_formatter
}; };
// Full weekday name // Full weekday name
static const char* full_days[]{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}; static const char *full_days[]{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
class A_formatter : public flag_formatter class A_formatter : public flag_formatter
{ {
void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
@ -95,7 +95,7 @@ class A_formatter : public flag_formatter
}; };
// Abbreviated month // Abbreviated month
static const char* months[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}; static const char *months[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"};
class b_formatter : public flag_formatter class b_formatter : public flag_formatter
{ {
void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
@ -105,7 +105,7 @@ class b_formatter : public flag_formatter
}; };
// Full month name // Full month name
static const char* full_months[]{ static const char *full_months[]{
"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}; "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
class B_formatter : public flag_formatter class B_formatter : public flag_formatter
{ {

View File

@ -81,7 +81,6 @@ public:
return tp_; return tp_;
} }
// 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
void set_formatter(std::unique_ptr<formatter> formatter) void set_formatter(std::unique_ptr<formatter> formatter)
{ {
@ -169,7 +168,10 @@ public:
} }
private: private:
registry_t<Mutex>() : formatter_(new pattern_formatter("%+")){} registry_t<Mutex>()
: formatter_(new pattern_formatter("%+"))
{
}
~registry_t<Mutex>() ~registry_t<Mutex>()
{ {
@ -196,7 +198,7 @@ private:
Mutex loggers_mutex_; Mutex loggers_mutex_;
std::recursive_mutex tp_mutex_; std::recursive_mutex tp_mutex_;
std::unordered_map<std::string, std::shared_ptr<logger>> loggers_; std::unordered_map<std::string, std::shared_ptr<logger>> loggers_;
//std::unique_ptr<formatter> formatter_{ new pattern_formatter("%+") }; // std::unique_ptr<formatter> formatter_{ new pattern_formatter("%+") };
std::unique_ptr<formatter> formatter_; std::unique_ptr<formatter> formatter_;
level::level_enum level_ = level::info; level::level_enum level_ = level::info;
level::level_enum flush_level_ = level::off; level::level_enum flush_level_ = level::off;