highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 06:28:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

logging: Drop BCLog::Level::None

Browse Source 
Now that Info-level logging is always logged, there is no further
need for the "None" level, so remove it.
This commit is contained in:
Anthony Towns
2023-08-22 14:38:38 +10:00
parent ab34dc6012
commit 667ce3e329
3 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/logging.cpp
View File

@@ -215,8 +215,6 @@ std::string BCLog::Logger::LogLevelToStr(BCLog::Level level)
return "warning";
case BCLog::Level::Error:
return "error";
case BCLog::Level::None:
return "";
}
assert(false);
}
@@ -307,8 +305,6 @@ static std::optional<BCLog::Level> GetLogLevel(const std::string& level_str)
return BCLog::Level::Warning;
} else if (level_str == "error") {
return BCLog::Level::Error;
} else if (level_str == "none") {
return BCLog::Level::None;
} else {
return std::nullopt;
}
@@ -396,20 +392,17 @@ std::string BCLog::Logger::GetLogPrefix(BCLog::LogFlags category, BCLog::Level l
{
const bool has_category{category != LogFlags::NONE};
if (!has_category && level == Level::None) return {};
// If there is no category, Info is implied
if (!has_category && level == Level::Info) return {};
std::string s{"["};
if (has_category) {
s += LogCategoryToStr(category);
// If there is a category, Debug is implied
if (level == Level::Debug) level = Level::None;
}
if (level != Level::None) {
if (!has_category || level != Level::Debug) {
// If there is a category, Debug is implied, so don't add the level
// Only add separator if we have a category
if (has_category) s += ":";
s += Logger::LogLevelToStr(level);