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

wip

Browse Source
This commit is contained in:
gabime
2019-12-21 19:52:37 +02:00
parent 1f8e9ad0fc
commit a87700a28c
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/spdlog/loaders/argv.h
View File

@@ -17,12 +17,11 @@
// turn off all logging except for logger1 and logger2: // turn off all logging except for logger1 and logger2:
// example.exe "SPDLOG_LEVEL=off,logger1=debug,logger2=info" // example.exe "SPDLOG_LEVEL=off,logger1=debug,logger2=info"
namespace spdlog { namespace spdlog {
namespace loaders { namespace loaders {
// search for SPDLOG_LEVEL= in the args and use it to init the levels // search for SPDLOG_LEVEL= in the args and use it to init the levels
void load_argv(int args, const char *argv[]) void load_argv(int args, char **argv)
{ {
const std::string spdlog_level_prefix = "SPDLOG_LEVEL="; const std::string spdlog_level_prefix = "SPDLOG_LEVEL=";
for (int i = 1; i < args; i++) for (int i = 1; i < args; i++)
@@ -36,5 +35,10 @@ void load_argv(int args, const char *argv[])
} }
} }
} }
void load_argv(int args, const char **argv)
{
return load_argv(args, const_cast<const char**>(argv));
}
} // namespace loaders } // namespace loaders
} // namespace spdlog } // namespace spdlog

3
include/spdlog/loaders/helpers-inl.h
View File

@@ -19,7 +19,6 @@ namespace spdlog {
namespace loaders { namespace loaders {
namespace helpers { namespace helpers {
// inplace convert to lowercase // inplace convert to lowercase
inline std::string &to_lower_(std::string &str) inline std::string &to_lower_(std::string &str)
{ {
@@ -99,6 +98,6 @@ SPDLOG_INLINE log_levels extract_levels(const std::string &input)
return rv; return rv;
} }
} // namespace text_loader } // namespace helpers
} // namespace loaders } // namespace loaders
} // namespace spdlog } // namespace spdlog

2
include/spdlog/loaders/helpers.h
View File

@@ -18,7 +18,7 @@ namespace helpers {
// turn off all logging except for logger1 and logger2: "off,logger1=debug,logger2=info" // turn off all logging except for logger1 and logger2: "off,logger1=debug,logger2=info"
// //
log_levels extract_levels(const std::string &txt); log_levels extract_levels(const std::string &txt);
} } // namespace helpers
} // namespace loaders } // namespace loaders
} // namespace spdlog } // namespace spdlog

15
tests/test_loaders.cpp
View File

@@ -4,12 +4,12 @@
#include <spdlog/loaders/env.h> #include <spdlog/loaders/env.h>
#include <spdlog/loaders/argv.h> #include <spdlog/loaders/argv.h>
using spdlog::loaders::load_env;
using spdlog::loaders::load_argv; using spdlog::loaders::load_argv;
using spdlog::loaders::load_env;
TEST_CASE("env", "[loaders]") TEST_CASE("env", "[loaders]")
{ {
auto l1 = spdlog::create<spdlog::sinks::test_sink_st >("l1"); auto l1 = spdlog::create<spdlog::sinks::test_sink_st>("l1");
setenv("SPDLOG_LEVEL", "l1=warn", 1); setenv("SPDLOG_LEVEL", "l1=warn", 1);
load_env(); load_env();
REQUIRE(l1->level() == spdlog::level::warn); REQUIRE(l1->level() == spdlog::level::warn);
@@ -19,7 +19,7 @@ TEST_CASE("env", "[loaders]")
TEST_CASE("argv1", "[loaders]") TEST_CASE("argv1", "[loaders]")
{ {
const char* argv[] = {"ignore", "SPDLOG_LEVEL=l1=warn"}; const char *argv[] = {"ignore", "SPDLOG_LEVEL=l1=warn"};
load_argv(2, argv); load_argv(2, argv);
auto l1 = spdlog::create<spdlog::sinks::test_sink_st>("l1"); auto l1 = spdlog::create<spdlog::sinks::test_sink_st>("l1");
REQUIRE(l1->level() == spdlog::level::warn); REQUIRE(l1->level() == spdlog::level::warn);
@@ -29,7 +29,7 @@ TEST_CASE("argv1", "[loaders]")
TEST_CASE("argv2", "[loaders]") TEST_CASE("argv2", "[loaders]")
{ {
const char* argv[] = {"ignore", "SPDLOG_LEVEL=l1=warn,trace"}; const char *argv[] = {"ignore", "SPDLOG_LEVEL=l1=warn,trace"};
load_argv(2, argv); load_argv(2, argv);
auto l1 = spdlog::create<spdlog::sinks::test_sink_st>("l1"); auto l1 = spdlog::create<spdlog::sinks::test_sink_st>("l1");
REQUIRE(l1->level() == spdlog::level::warn); REQUIRE(l1->level() == spdlog::level::warn);
@@ -39,7 +39,7 @@ TEST_CASE("argv2", "[loaders]")
TEST_CASE("argv3", "[loaders]") TEST_CASE("argv3", "[loaders]")
{ {
const char* argv[] = {"ignore", "SPDLOG_LEVEL="}; const char *argv[] = {"ignore", "SPDLOG_LEVEL="};
load_argv(2, argv); load_argv(2, argv);
auto l1 = spdlog::create<spdlog::sinks::test_sink_st>("l1"); auto l1 = spdlog::create<spdlog::sinks::test_sink_st>("l1");
REQUIRE(l1->level() == spdlog::level::info); REQUIRE(l1->level() == spdlog::level::info);
@@ -49,12 +49,9 @@ TEST_CASE("argv3", "[loaders]")
TEST_CASE("argv4", "[loaders]") TEST_CASE("argv4", "[loaders]")
{ {
const char* argv[] = {"ignore", "SPDLOG_LEVEL=junk"}; const char *argv[] = {"ignore", "SPDLOG_LEVEL=junk"};
load_argv(2, argv); load_argv(2, argv);
auto l1 = spdlog::create<spdlog::sinks::test_sink_st>("l1"); auto l1 = spdlog::create<spdlog::sinks::test_sink_st>("l1");
REQUIRE(l1->level() == spdlog::level::info); REQUIRE(l1->level() == spdlog::level::info);
spdlog::drop(l1->name()); spdlog::drop(l1->name());
} }