Skip to content

Commit bbcaff5

Browse files
committed
fix(logging): normalize log level parsing
* Makes log level parsing case-insensitive to avoid surprising CLI/env behavior * Treats `none` as `error` so logging is never fully disabled and critical messages still surface * Improves warning output by reporting the normalized unknown value
1 parent 3f9ce58 commit bbcaff5

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

src/Command.cpp

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2021-2024 Saturneric <eric@bktus.com>
2+
* Copyright (C) 2021-2026 Saturneric <eric@bktus.com>
33
*
44
* This file is part of GpgFrontend.
55
*
@@ -170,26 +170,29 @@ auto PrintEnvInfo() -> int {
170170

171171
auto ParseLogLevel(const QString& log_level) -> int {
172172
// default value
173-
if (log_level == "none") return 0;
173+
auto level = log_level.toLower();
174+
if (level == "none") {
175+
level = "error";
176+
}
174177

175-
if (log_level == "debug") {
178+
if (level == "debug") {
176179
SetGFLogLevel(static_cast<int>(GFLogLevel::kDEBUG));
177180
QLoggingCategory::setFilterRules(
178181
BuildQtLoggingFilterRules(static_cast<int>(GFLogLevel::kDEBUG)));
179-
} else if (log_level == "info") {
182+
} else if (level == "info") {
180183
SetGFLogLevel(static_cast<int>(GFLogLevel::kINFO));
181184
QLoggingCategory::setFilterRules(
182185
BuildQtLoggingFilterRules(static_cast<int>(GFLogLevel::kINFO)));
183-
} else if (log_level == "warn") {
186+
} else if (level == "warn") {
184187
SetGFLogLevel(static_cast<int>(GFLogLevel::kWARNING));
185188
QLoggingCategory::setFilterRules(
186189
BuildQtLoggingFilterRules(static_cast<int>(GFLogLevel::kWARNING)));
187-
} else if (log_level == "error") {
190+
} else if (level == "error") {
188191
SetGFLogLevel(static_cast<int>(GFLogLevel::kCRITICAL));
189192
QLoggingCategory::setFilterRules(
190193
BuildQtLoggingFilterRules(static_cast<int>(GFLogLevel::kCRITICAL)));
191194
} else {
192-
qWarning() << "unknown log level: " << log_level;
195+
qWarning() << "unknown log level: " << level;
193196
}
194197
return 0;
195198
}

0 commit comments

Comments
 (0)