refactor and and support for init from argv

1 files changed, 10 insertions, 11 deletions

diff --git a/include/spdlog/cfg/env.h b/include/spdlog/cfg/env.h
index 9a74f999..5ef86f99 100644
--- a/include/spdlog/cfg/env.h
+++ b/include/spdlog/cfg/env.h
@@ -2,10 +2,8 @@
 // Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
 #pragma once
-
-#include <spdlog/common.h>
-#include <string>
-#include <unordered_map>
+#include <spdlog/cfg/text_loader.h>
+#include <spdlog/details/os.h>
 
 //
 // Init levels and patterns from env variables SPDLOG_LEVEL
@@ -24,11 +22,12 @@
 // export SPDLOG_LEVEL="off,logger1=debug,logger2=info"
 
 namespace spdlog {
-namespace env {
-void load_levels();
-} // namespace env
+namespace cfg {
+void init_from_env()
+{
+    auto cfg = details::os::getenv("SPDLOG_LEVEL");
+    auto levels = text_loader::load_levels(cfg);
+    spdlog::details::registry::instance().set_levels(levels);
+}
+} // namespace cfg
 } // namespace spdlog
-
-#ifdef SPDLOG_HEADER_ONLY
-#include "env-inl.h"
-#endif // SPDLOG_HEADER_ONLY