fix: debug rpc should return a list of active debug categories, not…

… all of them
UdjinM6 · Sep 26, 2023 · b5c092b · b5c092b
1 parent 7bff85e
commit b5c092b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/logging.cpp b/src/logging.cpp
@@ -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) {
@@ -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;

diff --git a/src/logging.h b/src/logging.h
@@ -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;

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -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)
-Original file 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 @@