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

wip fix #1680 again

Browse Source
This commit is contained in:
gabime
2020-09-26 14:41:33 +03:00
parent 3a68eecb28
commit 1ac2dcc537
8 changed files with 98 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/spdlog/cfg/argv.h
View File

@@ -31,7 +31,7 @@ inline void load_argv_levels(int argc, const char **argv)
{
auto levels_string = arg.substr(spdlog_level_prefix.size());
auto levels = helpers::extract_levels(levels_string);
details::registry::instance().update_levels(std::move(levels));
details::registry::instance().set_levels(std::move(levels));
}
}
}

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

@@ -31,7 +31,7 @@ inline void load_env_levels()
if (!env_val.empty())
{
auto levels = helpers::extract_levels(env_val);
details::registry::instance().update_levels(std::move(levels));
details::registry::instance().set_levels(std::move(levels));
}
}

14
include/spdlog/cfg/helpers-inl.h
View File

@@ -73,27 +73,31 @@ inline std::unordered_map<std::string, std::string> extract_key_vals_(const std:
continue;
}
auto kv = extract_kv_('=', token);
if (kv.first.empty())
{
kv.first = "*";
}
rv[kv.first] = kv.second;
}
return rv;
}
SPDLOG_INLINE log_levels extract_levels(const std::string &input)
SPDLOG_INLINE std::unordered_map<std::string, spdlog::level::level_enum> extract_levels(const std::string &input)
{
auto key_vals = extract_key_vals_(input);
log_levels rv;
std::unordered_map<std::string, spdlog::level::level_enum> rv;
for (auto &name_level : key_vals)
{
auto &logger_name = name_level.first;
auto level_name = to_lower_(name_level.second);
auto level = level::from_str(level_name);
// fallback to "info" if unrecognized level name
// ignore unrecognized level names
if (level == level::off && level_name != "off")
{
level = level::info;
continue;
}
rv.set(logger_name, level);
rv[logger_name] = level;
}
return rv;
}

5
include/spdlog/cfg/helpers.h
View File

@@ -3,7 +3,8 @@
#pragma once
#include <spdlog/cfg/log_levels.h>
#include <spdlog/common.h>
#include <unordered_map>
namespace spdlog {
namespace cfg {
@@ -17,7 +18,7 @@ namespace helpers {
// turn off all logging except for logger1: "off,logger1=debug"
// turn off all logging except for logger1 and logger2: "off,logger1=debug,logger2=info"
//
SPDLOG_API log_levels extract_levels(const std::string &txt);
SPDLOG_API std::unordered_map<std::string, spdlog::level::level_enum> extract_levels(const std::string &txt);
} // namespace helpers
} // namespace cfg

25
include/spdlog/cfg/log_levels.h
View File

@@ -12,7 +12,7 @@ namespace cfg {
class log_levels
{
std::unordered_map<std::string, spdlog::level::level_enum> levels_;
spdlog::level::level_enum default_level_ = level::info;
spdlog::level::level_enum global_level_ = level::info;
public:
void set(const std::string &logger_name, level::level_enum lvl)
@@ -20,27 +20,32 @@ public:
levels_[logger_name] = lvl;
}
void set_default(level::level_enum lvl)
void set_global_level(level::level_enum lvl)
{
levels_[""] = lvl;
global_level_ = lvl;
}
// configure log level of given logger if it appears in the config list or if default level is set
void update_logger_level(spdlog::logger &logger)
level::level_enum default_level()
{
auto &logger_name = logger.name();
auto it = levels_.find(logger_name);
return global_level_;
}
// if logger was not configured, check if default log level was configured
// update log level of given logger if it appears in the config list or if default level is set
// return true if updated
bool update_logger_level(spdlog::logger &logger)
{
// if logger was not configured, check if global log level was configured
auto it = levels_.find(logger.name());
if (it == levels_.end())
{
it = levels_.find(""); //
it = levels_.find("*");
}
if (it != levels_.end())
{
logger.set_level(it->second);
return true;
}
return false;
}
};
} // namespace cfg