Skip to content

Fix #3525: Make level name matching case-insensitive #3535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gabime merged 1 commit into from
Feb 9, 2026
+60 −3
Merged

Fix #3525: Make level name matching case-insensitive #3535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions include/spdlog/common-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,31 @@ SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOE
}

SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT {
auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name);
auto it = std::find_if(std::begin(level_string_views), std::end(level_string_views),
[&name](const string_view_t &level_name) {
return level_name.size() == name.size() &&
std::equal(name.begin(), name.end(), level_name.begin(),
[](char a, char b) {
return std::tolower(static_cast<unsigned char>(a)) ==
std::tolower(static_cast<unsigned char>(b));
});
});
if (it != std::end(level_string_views))
return static_cast<level::level_enum>(std::distance(std::begin(level_string_views), it));

// check also for "warn" and "err" before giving up..
if (name == "warn") {
auto iequals = [](const std::string &a, const std::string &b) {
return a.size() == b.size() &&
std::equal(a.begin(), a.end(), b.begin(), [](char ac, char bc) {
return std::tolower(static_cast<unsigned char>(ac)) ==
std::tolower(static_cast<unsigned char>(bc));
});
};

if (iequals(name, "warn")) {
return level::warn;
}
if (name == "err") {
if (iequals(name, "err")) {
return level::err;
}
return level::off;
Expand Down
30 changes: 30 additions & 0 deletions tests/test_cfg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,33 @@ TEST_CASE("restore-to-default", "[cfg]") {
load_argv_levels(2, argv);
REQUIRE(spdlog::default_logger()->level() == spdlog::level::info);
}

TEST_CASE("uppercase-level-names", "[cfg]") {
spdlog::drop("l1");
spdlog::drop("l2");

#ifdef CATCH_PLATFORM_WINDOWS
_putenv_s("SPDLOG_LEVEL", "l1=DEBUG,INFO");
#else
setenv("SPDLOG_LEVEL", "l1=DEBUG,INFO", 1);
#endif
load_env_levels();
auto l1 = spdlog::create<test_sink_st>("l1");
auto l2 = spdlog::create<test_sink_st>("l2");

REQUIRE(l1->level() == spdlog::level::debug);
REQUIRE(l2->level() == spdlog::level::info);
REQUIRE(spdlog::default_logger()->level() == spdlog::level::info);

// Test with argv
spdlog::drop("l3");
const char *argv[] = {"ignore", "SPDLOG_LEVEL=l3=WARN,ERROR"};
load_argv_levels(2, argv);
auto l3 = spdlog::create<test_sink_st>("l3");

REQUIRE(l3->level() == spdlog::level::warn);
REQUIRE(spdlog::default_logger()->level() == spdlog::level::err);

// Reset to info
spdlog::set_level(spdlog::level::info);
}
11 changes: 11 additions & 0 deletions tests/test_misc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,17 @@ TEST_CASE("to_level_enum", "[convert_to_level_enum]") {
REQUIRE(spdlog::level::from_str("critical") == spdlog::level::critical);
REQUIRE(spdlog::level::from_str("off") == spdlog::level::off);
REQUIRE(spdlog::level::from_str("null") == spdlog::level::off);
REQUIRE(spdlog::level::from_str("TRACE") == spdlog::level::trace);
REQUIRE(spdlog::level::from_str("DEBUG") == spdlog::level::debug);
REQUIRE(spdlog::level::from_str("INFO") == spdlog::level::info);
REQUIRE(spdlog::level::from_str("WARNING") == spdlog::level::warn);
REQUIRE(spdlog::level::from_str("WARN") == spdlog::level::warn);
REQUIRE(spdlog::level::from_str("ERROR") == spdlog::level::err);
REQUIRE(spdlog::level::from_str("ERR") == spdlog::level::err);
REQUIRE(spdlog::level::from_str("CRITICAL") == spdlog::level::critical);
REQUIRE(spdlog::level::from_str("OFF") == spdlog::level::off);
REQUIRE(spdlog::level::from_str("TrAcE") == spdlog::level::trace);
REQUIRE(spdlog::level::from_str("DeBuG") == spdlog::level::debug);
}

TEST_CASE("periodic flush", "[periodic_flush]") {
Expand Down
Loading