highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-09-12 21:52:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

logging: More fully remove libevent log category

Browse Source 
Libevent log category was partially removed in 39e9099da5, and this
commit extends that with the following changes:

- Stops showing libevent in the list of supported log categories in
  `bitcoind -help` and `bitcoin-cli help logging` output.

- Stops returning `"libevent": false` in `logging` RPC output.

It's not good to treat libevent as a supported log category when it
can't be enabled and trying to enable it results in warnings.

There's also no need to define an unused LIBEVENT constant value and
keep more complicated logic for dealing with deprecated log categories,
so this change also simplifies code internally.

Co-authored-by: David Gumberg <davidzgumberg@gmail.com>
Co-authored-by: l0rinc <pap.lorinc@gmail.com>
This commit is contained in:
Ryan Ofsky
2026-06-23 22:10:34 -04:00
parent d84fc352cb
commit 3765b428d1
5 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/logging.cpp
View File

@@ -133,11 +133,6 @@ void BCLog::Logger::EnableCategory(BCLog::LogFlags flag)
bool BCLog::Logger::EnableCategory(std::string_view str)
{
if (const auto flag{GetLogCategory(str)}) {
if (*flag & DEPRECATED){
LogWarning("The logging category `%s` is deprecated, can not be enabled, and will be removed in a future version", str);
// Deprecated does not mean unsupported, which may prevent startup
return true;
}
EnableCategory(*flag);
return true;
}
@@ -152,11 +147,6 @@ void BCLog::Logger::DisableCategory(BCLog::LogFlags flag)
bool BCLog::Logger::DisableCategory(std::string_view str)
{
if (const auto flag{GetLogCategory(str)}) {
if (*flag & DEPRECATED){
LogWarning("The logging category `%s` is deprecated and will be removed in a future version", str);
// Deprecated does not mean unsupported, which may prevent startup
return true;
}
DisableCategory(*flag);
return true;
}
@@ -204,7 +194,6 @@ static const std::map<std::string, BCLog::LogFlags, std::less<>> LOG_CATEGORIES_
{"prune", BCLog::PRUNE},
{"proxy", BCLog::PROXY},
{"mempoolrej", BCLog::MEMPOOLREJ},
{"libevent", BCLog::LIBEVENT},
{"coindb", BCLog::COINDB},
{"qt", BCLog::QT},
{"leveldb", BCLog::LEVELDB},
@@ -243,6 +232,10 @@ std::optional<BCLog::LogFlags> BCLog::Logger::GetLogCategory(std::string_view st
if (it != LOG_CATEGORIES_BY_STR.end()) {
return it->second;
}
if (str == "libevent") {
LogWarning("The logging category `%s` is deprecated, does nothing, and will be removed in a future version", str);
return BCLog::NONE;
}
return std::nullopt;
}
@@ -616,6 +609,7 @@ bool BCLog::Logger::SetCategoryLogLevel(std::string_view category_str, std::stri
const auto level = GetLogLevel(level_str);
if (!level.has_value() || level.value() > MAX_USER_SETABLE_SEVERITY_LEVEL) return false;
if (*flag == BCLog::NONE) return true;
STDLOCK(m_cs);
m_category_log_levels[*flag] = level.value();