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

Simplify and removed SPDLOG_PATTERN support

Browse Source
This commit is contained in:
gabime
2019-12-13 14:49:41 +02:00
parent cd8d7e6de9
commit 3d203aa7c4
5 changed files with 50 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
include/spdlog/cfg/env-inl.h
View File

@@ -4,12 +4,12 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
#include "spdlog/cfg/env.h"
#include <spdlog/cfg/env.h>
#endif
#include "spdlog/spdlog.h"
#include "spdlog/details/os.h"
#include "spdlog/details/registry.h"
#include <spdlog/spdlog.h>
#include <spdlog/details/os.h>
#include <spdlog/details/registry.h>
#include <string>
#include <utility>
@@ -74,73 +74,43 @@ SPDLOG_INLINE std::unordered_map<std::string, std::string> extract_key_vals_(con
continue;
}
auto kv = extract_kv_('=', token);
// '*' marks all loggers
if (kv.first.empty())
{
kv.first = "*";
}
rv.insert(std::move(kv));
rv[kv.first] = kv.second;
}
return rv;
}
inline details::registry::logger_cfgs from_env_()
inline details::registry::logger_levels from_env_()
{
using details::os::getenv;
details::registry::logger_cfgs configs;
auto key_vals = extract_key_vals_(getenv("SPDLOG_LEVEL"));
details::registry::logger_levels rv;
auto levels = extract_key_vals_(getenv("SPDLOG_LEVEL"));
auto patterns = extract_key_vals_(getenv("SPDLOG_PATTERN"));
// merge to single dict. and take into account "*"
for (auto &name_level : levels)
for (auto &name_level : key_vals)
{
auto &logger_name = name_level.first;
assert(!logger_name.empty());
auto level_name = to_lower_(name_level.second);
details::registry::logger_cfg cfg;
cfg.level_name = level_name;
if (logger_name == "*")
auto level = level::from_str(level_name);
// fallback to "info" if unrecognized level name
if (level == level::off && level_name != "off")
{
configs.default_cfg.level_name = cfg.level_name;
level = level::info;
}
if (logger_name.empty() || logger_name == "*")
{
rv.default_level = level;
}
else
{
configs.loggers.emplace(logger_name, cfg);
}
}
for (auto &name_pattern : patterns)
{
auto &logger_name = name_pattern.first;
auto &pattern = name_pattern.second;
auto it = configs.loggers.find(logger_name);
if (it != configs.loggers.end())
{
it->second.pattern = pattern;
}
if (logger_name == "*")
{
configs.default_cfg.pattern = pattern;
}
else
{
details::registry::logger_cfg cfg;
cfg.pattern = pattern;
configs.loggers.emplace(logger_name, cfg);
rv.levels[logger_name] = level;
}
}
return configs;
return rv;
}
SPDLOG_INLINE void init()
SPDLOG_INLINE void load_levels()
{
spdlog::details::registry::instance().set_configs(from_env_());
spdlog::details::registry::instance().set_levels(from_env_());
}
} // namespace env

14
include/spdlog/cfg/env.h
View File

@@ -8,8 +8,9 @@
#include <unordered_map>
//
// Init levels and patterns from env variables SPDLOG_LEVEL and SPDLOG_PATTERN.
// Init levels and patterns from env variables SPDLOG_LEVEL
// Inspired from Rust's "env_logger" crate (https://crates.io/crates/env_logger).
// Note - fallback to "info" level on unrecognized levels
//
// Examples:
//
@@ -21,19 +22,10 @@
//
// turn off all logging except for logger1 and logger2:
// export SPDLOG_LEVEL="off,logger1=debug,logger2=info"
//
// set global pattern:
// export SPDLOG_PATTERN="[%x] [%l] [%n] %v"
//
// set pattern for logger1:
// export SPDLOG_PATTERN="logger1=%v,*=[%x] [%l] [%n] %v"
//
// set global pattern and different pattern for logger1:
// export SPDLOG_PATTERN="[%x] [%l] [%n] %v,logger1=[%u] %v"
namespace spdlog {
namespace env {
void init();
void load_levels();
}
} // namespace spdlog