Mirror/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-10-02 11:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactored to cfg::log_levels class

Browse Source
This commit is contained in:
gabime
2019-12-21 15:54:09 +02:00
parent 65ada37399
commit 68ed281461
7 changed files with 68 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/spdlog/details/registry-inl.h
View File

@@ -30,11 +30,6 @@
namespace spdlog {
namespace details {
SPDLOG_INLINE level::level_enum registry::logger_levels::get_or_default(const std::string &name)
{
auto it = levels.find(name);
return it != levels.end() ? it->second : default_level;
}
SPDLOG_INLINE registry::registry()
: formatter_(new pattern_formatter())
@@ -70,7 +65,7 @@ SPDLOG_INLINE void registry::initialize_logger(std::shared_ptr<logger> new_logge
new_logger->set_error_handler(err_handler_);
}
new_logger->set_level(levels_.get_or_default(new_logger->name()));
new_logger->set_level(levels_.get(new_logger->name()));
new_logger->flush_on(flush_level_);
if (backtrace_n_messages_ > 0)
@@ -174,7 +169,7 @@ SPDLOG_INLINE void registry::set_level(level::level_enum log_level)
{
l.second->set_level(log_level);
}
levels_.default_level = log_level;
levels_.set("*", log_level);
}
SPDLOG_INLINE void registry::flush_on(level::level_enum log_level)
@@ -266,14 +261,14 @@ SPDLOG_INLINE void registry::set_automatic_registration(bool automatic_registrat
automatic_registration_ = automatic_registration;
}
SPDLOG_INLINE void registry::set_levels(logger_levels levels)
SPDLOG_INLINE void registry::set_levels(cfg::log_levels levels)
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
levels_ = std::move(levels);
for (auto &l : loggers_)
{
auto &logger = l.second;
logger->set_level(levels_.get_or_default(logger->name()));
logger->set_level(levels_.get(logger->name()));
}
}

11
include/spdlog/details/registry.h
View File

@@ -9,6 +9,7 @@
// This class is thread safe
#include <spdlog/common.h>
#include <spdlog/cfg/cfg.h>
#include <chrono>
#include <functional>
@@ -27,12 +28,6 @@ class periodic_worker;
class registry
{
public:
struct logger_levels
{
std::unordered_map<std::string, spdlog::level::level_enum> levels;
spdlog::level::level_enum default_level = level::info;
spdlog::level::level_enum get_or_default(const std::string &name);
};
registry(const registry &) = delete;
registry &operator=(const registry &) = delete;
@@ -86,7 +81,7 @@ public:
void set_automatic_registration(bool automatic_registration);
void set_levels(logger_levels levels);
void set_levels(cfg::log_levels levels);
static registry &instance();
@@ -99,7 +94,7 @@ private:
std::mutex logger_map_mutex_, flusher_mutex_;
std::recursive_mutex tp_mutex_;
std::unordered_map<std::string, std::shared_ptr<logger>> loggers_;
logger_levels levels_;
cfg::log_levels levels_;
std::unique_ptr<formatter> formatter_;
level::level_enum flush_level_ = level::off;
void (*err_handler_)(const std::string &msg);