refactor env-inl

example/example.cpp

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

include/spdlog/cfg/env-inl.h

@@ -38,7 +38,7 @@ inline std::string &trim_(std::string &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
 // "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;
 }
 
-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;
 
     for (auto &name_level : key_vals)
@@ -108,9 +107,11 @@ inline details::registry::logger_levels from_env_()
     return rv;
 }
 
+
 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