Skip to content

fix: debug rpc should return a list of active debug categories, not all of them #5585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 28, 2023
Merged

fix: debug rpc should return a list of active debug categories, not all of them #5585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5c092b
fix: `debug` rpc should return a list of active debug categories, not…
UdjinM6 Sep 26, 2023
2698c5a
Update src/rpc/misc.cpp
UdjinM6 Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/logging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ bool GetLogCategory(BCLog::LogFlags& flag, const std::string& str)
return false;
}

std::vector<LogCategory> BCLog::Logger::LogCategoriesList() const
std::vector<LogCategory> BCLog::Logger::LogCategoriesList(bool enabled_only) const
{
std::vector<LogCategory> ret;
for (const CLogCategoryDesc& category_desc : LogCategories) {
Expand All @@ -206,7 +206,9 @@ std::vector<LogCategory> BCLog::Logger::LogCategoriesList() const
LogCategory catActive;
catActive.category = category_desc.category;
catActive.active = WillLogCategory(category_desc.flag);
ret.push_back(catActive);
if (!enabled_only || catActive.active) {
ret.push_back(catActive);
}
}
}
return ret;
Expand Down
6 changes: 3 additions & 3 deletions src/logging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,11 @@ namespace BCLog {

bool WillLogCategory(LogFlags category) const;
/** Returns a vector of the log categories */
std::vector<LogCategory> LogCategoriesList() const;
std::vector<LogCategory> LogCategoriesList(bool enabled_only = false) const;
/** Returns a string with the log categories */
std::string LogCategoriesString() const
std::string LogCategoriesString(bool enabled_only = false) const
{
return Join(LogCategoriesList(), ", ", [&](const LogCategory& i) { return i.category; });
return Join(LogCategoriesList(enabled_only), ", ", [&](const LogCategory& i) { return i.category; });
};

bool DefaultShrinkDebugFile() const;
Expand Down
2 changes: 1 addition & 1 deletion src/rpc/misc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static UniValue debug(const JSONRPCRequest& request)
}
}

return "Debug mode: " + LogInstance().LogCategoriesString();
return "Debug mode: " + LogInstance().LogCategoriesString(/*enabled_only=*/true);
}

static UniValue mnsync(const JSONRPCRequest& request)
Expand Down