Make "-B all" apply to plugin streams as well.

ckreibich · Nov 15, 2024 · f56ab49 · f56ab49
1 parent 5e4942b
commit f56ab49
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/DebugLogger.cc b/src/DebugLogger.cc
@@ -22,8 +22,9 @@ DebugLogger::Stream DebugLogger::streams[NUM_DBGS] =
      {"scripts", 0, false},   {"supervisor", 0, false}, {"hashkey", 0, false},         {"spicy", 0, false}};
 
 DebugLogger::DebugLogger() {
-    verbose = false;
     file = nullptr;
+    verbose = false;
+    all = false;
 }
 
 DebugLogger::~DebugLogger() {
@@ -94,6 +95,7 @@ void DebugLogger::EnableStreams(const char* s) {
                 enabled_streams.insert(streams[i].prefix);
             }
 
+            all = true;
             verbose = true;
             goto next;
         }
@@ -175,10 +177,11 @@ void DebugLogger::Log(DebugStream stream, const char* fmt, ...) {
 }
 
 void DebugLogger::Log(const plugin::Plugin& plugin, const char* fmt, ...) {
-    std::string tok = PluginStreamName(plugin.Name());
-
-    if ( enabled_streams.find(tok) == enabled_streams.end() )
-        return;
+    if ( ! all ) {
+        std::string tok = PluginStreamName(plugin.Name());
+        if ( enabled_streams.find(tok) == enabled_streams.end() )
+            return;
+    }
 
     fprintf(file, "%17.06f/%17.06f [plugin %s] ", run_state::network_time, util::current_time(true),
             plugin.Name().c_str());

diff --git a/src/DebugLogger.h b/src/DebugLogger.h
@@ -95,6 +95,7 @@ class DebugLogger {
 
 private:
     FILE* file;
+    bool all;
     bool verbose;
 
     struct Stream {