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

util: Encapsulate logCategories within BCLog::Logger.

Browse Source
This commit is contained in:
Jim Posen
2018-04-11 13:02:01 -07:00
parent 6a6d764ca5
commit 3316a9ebb6
7 changed files with 55 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/rpc/misc.cpp
View File

@@ -346,9 +346,8 @@ UniValue getmemoryinfo(const JSONRPCRequest& request)
}
}
uint32_t getCategoryMask(UniValue cats) {
void EnableOrDisableLogCategories(UniValue cats, bool enable) {
cats = cats.get_array();
uint32_t mask = 0;
for (unsigned int i = 0; i < cats.size(); ++i) {
uint32_t flag = 0;
std::string cat = cats[i].get_str();
@@ -356,11 +355,14 @@ uint32_t getCategoryMask(UniValue cats) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "unknown logging category " + cat);
}
if (flag == BCLog::NONE) {
return 0;
return;
}
if (enable) {
g_logger->EnableCategory(static_cast<BCLog::LogFlags>(flag));
} else {
g_logger->DisableCategory(static_cast<BCLog::LogFlags>(flag));
}
mask |= flag;
}
return mask;
}
UniValue logging(const JSONRPCRequest& request)
@@ -399,25 +401,25 @@ UniValue logging(const JSONRPCRequest& request)
);
}
uint32_t originalLogCategories = logCategories;
uint32_t original_log_categories = g_logger->GetCategoryMask();
if (request.params[0].isArray()) {
logCategories |= getCategoryMask(request.params[0]);
EnableOrDisableLogCategories(request.params[0], true);
}
if (request.params[1].isArray()) {
logCategories &= ~getCategoryMask(request.params[1]);
EnableOrDisableLogCategories(request.params[1], false);
}
uint32_t updated_log_categories = g_logger->GetCategoryMask();
uint32_t changed_log_categories = original_log_categories ^ updated_log_categories;
// Update libevent logging if BCLog::LIBEVENT has changed.
// If the library version doesn't allow it, UpdateHTTPServerLogging() returns false,
// in which case we should clear the BCLog::LIBEVENT flag.
// Throw an error if the user has explicitly asked to change only the libevent
// flag and it failed.
uint32_t changedLogCategories = originalLogCategories ^ logCategories;
if (changedLogCategories & BCLog::LIBEVENT) {
if (!UpdateHTTPServerLogging(logCategories & BCLog::LIBEVENT)) {
logCategories &= ~BCLog::LIBEVENT;
if (changedLogCategories == BCLog::LIBEVENT) {
if (changed_log_categories & BCLog::LIBEVENT) {
if (!UpdateHTTPServerLogging(g_logger->WillLogCategory(BCLog::LIBEVENT))) {
g_logger->DisableCategory(BCLog::LIBEVENT);
if (changed_log_categories == BCLog::LIBEVENT) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "libevent logging cannot be updated when using libevent before v2.1.1.");
}
}