gitMirror/spdlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor env-inl

Browse Source
This commit is contained in:
gabime 2019-12-13 15:14:20 +02:00
parent 3d203aa7c4
commit 8992f36fbf
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
example/example.cpp
View File

@ -12,12 +12,15 @@ int main(int, char *[])
{ {
try try
{ {
spdlog::set_level(spdlog::level::warn);
spdlog::env::load_levels(); spdlog::env::load_levels();
auto l1 = spdlog::stderr_color_st("l1"); auto l1 = spdlog::stderr_color_st("l1");
auto l2 = spdlog::stderr_color_st("l2"); auto l2 = spdlog::stderr_color_st("l2");
spdlog::info("Hello default logger"); spdlog::info("Hello default logger");
l1->debug("Hello l1"); l1->debug("Hello l1");
l2->trace("Hello l2"); // l2->trace("Hello l2");
} }
catch (spdlog::spdlog_ex &ex) catch (spdlog::spdlog_ex &ex)
{ {

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

@ -38,7 +38,7 @@ inline std::string &trim_(std::string &str)
return str; return str;
} }
// return (name,value) pair from given "name=value" string. // return (name,value) trimmed pair from given "name=value" string.
// return empty string on missing parts // return empty string on missing parts
// "key=val" => ("key", "val") // "key=val" => ("key", "val")
// " key = val " => ("key", "val") // " key = val " => ("key", "val")
@ -79,10 +79,9 @@ SPDLOG_INLINE std::unordered_map<std::string, std::string> extract_key_vals_(con
return rv; return rv;
} }
inline details::registry::logger_levels from_env_() inline details::registry::logger_levels from_string_(const std::string& input)
{ {
using details::os::getenv; auto key_vals = extract_key_vals_(input);
auto key_vals = extract_key_vals_(getenv("SPDLOG_LEVEL"));
details::registry::logger_levels rv; details::registry::logger_levels rv;
for (auto &name_level : key_vals) for (auto &name_level : key_vals)
@ -108,9 +107,11 @@ inline details::registry::logger_levels from_env_()
return rv; return rv;
} }
SPDLOG_INLINE void load_levels() SPDLOG_INLINE void load_levels()
{ {
spdlog::details::registry::instance().set_levels(from_env_()); auto levels = from_string_(details::os::getenv("SPDLOG_LEVEL"));
spdlog::details::registry::instance().set_levels(levels);
} }
} // namespace env } // namespace env