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

logging: make [cat:debug] and [info] implicit

Browse Source
This commit is contained in:
Anthony Towns
2023-08-22 14:17:53 +10:00
parent c5c76dc615
commit dfe98b6874
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/logging.cpp
View File

@@ -394,26 +394,29 @@ namespace BCLog {
std::string BCLog::Logger::GetLogPrefix(BCLog::LogFlags category, BCLog::Level level) const
{
if (category != LogFlags::NONE || level != Level::None) {
std::string s{"["};
const bool has_category{category != LogFlags::NONE};
if (category != LogFlags::NONE) {
s += LogCategoryToStr(category);
}
if (!has_category && level == Level::None) return {};
if (category != LogFlags::NONE && level != Level::None) {
// Only add separator if both flag and level are not NONE
s += ":";
}
// If there is no category, Info is implied
if (!has_category && level == Level::Info) return {};
if (level != Level::None) {
s += LogLevelToStr(level);
}
std::string s{"["};
if (has_category) {
s += LogCategoryToStr(category);
s += "] ";
return s;
// If there is a category, Debug is implied
if (level == Level::Debug) level = Level::None;
}
return {};
if (level != Level::None) {
// Only add separator if we have a category
if (has_category) s += ":";
s += Logger::LogLevelToStr(level);
}
s += "] ";
return s;
}
void BCLog::Logger::LogPrintStr(const std::string& str, const std::string& logging_function, const std::string& source_file, int source_line, BCLog::LogFlags category, BCLog::Level level)