DPL: display stderr ROOT logs in the terminal output according to their proper log level

Author: ehellbar

Framework/Core/include/Framework/DeviceInfo.h

@@ -45,6 +45,8 @@ struct DeviceInfo {
   size_t historySize;
   /// The maximum log level ever seen by this device
   LogParsingHelpers::LogLevel maxLogLevel;
+  /// The minimum log level for log messages sent/displayed by this device
+  LogParsingHelpers::LogLevel logLevel{LogParsingHelpers::LogLevel::Info};
 
   /// The minimum level after which the device will exit with 0
   LogParsingHelpers::LogLevel minFailureLevel;

Framework/Core/src/LogParsingHelpers.cxx

@@ -30,7 +30,7 @@ LogLevel LogParsingHelpers::parseTokenLevel(std::string_view const s)
   // Example format: [99:99:99][ERROR] (string begins with that, longest is 17 chars)
   constexpr size_t MAXPREFLEN = 17;
   constexpr size_t LABELPOS = 10;
-  if (s.size() < MAXPREFLEN) {
+  if (s.size() < MAXPREFLEN && s.find("*** Break ***") == std::string::npos && !s.starts_with("[INFO]")) {
     return LogLevel::Unknown;
   }
 
@@ -41,7 +41,17 @@ LogLevel LogParsingHelpers::parseTokenLevel(std::string_view const s)
       (unsigned char)s[1] - '0' > 9 || (unsigned char)s[2] - '0' > 9 ||
       (unsigned char)s[4] - '0' > 9 || (unsigned char)s[5] - '0' > 9 ||
       (unsigned char)s[7] - '0' > 9 || (unsigned char)s[8] - '0' > 9) {
-    return LogLevel::Unknown;
+    if (s.starts_with("Info in <") || s.starts_with("Print in <") || s.starts_with("[INFO]")) {
+      return LogLevel::Info;
+    } else if (s.starts_with("Warning in <")) {
+      return LogLevel::Warning;
+    } else if (s.find("Error in <") != std::string::npos) {
+      return LogLevel::Error;
+    } else if (s.starts_with("Fatal in <") || s.find("*** Break ***") != std::string::npos) {
+      return LogLevel::Fatal;
+    } else {
+      return LogLevel::Unknown;
+    }
   }
 
   if (s.compare(LABELPOS, 8, "[DEBUG] ") == 0) {

Framework/Core/src/runDataProcessing.cxx

@@ -884,8 +884,7 @@ void processChildrenOutput(uv_loop_t* loop,
         throw runtime_error("stdout is not supported anymore as a driver backend. Please use ws://");
       } else if (logLevel == LogParsingHelpers::LogLevel::Info && DeviceConfigHelper::parseConfig(token.substr(16), configMatch)) {
         throw runtime_error("stdout is not supported anymore as a driver backend. Please use ws://");
-      } else if (!control.quiet && (token.find(control.logFilter) != std::string::npos) &&
-                 logLevel >= control.logLevel) {
+      } else if (!control.quiet && (token.find(control.logFilter) != std::string::npos) && logLevel >= info.logLevel) {
         assert(info.historyPos >= 0);
         assert(info.historyPos < info.history.size());
         info.history[info.historyPos] = token;
@@ -2126,6 +2125,37 @@ int runStateMachine(DataProcessorSpecs const& workflow,
                          driverInfo.resourcesMonitoringDumpInterval * 1000,
                          driverInfo.resourcesMonitoringDumpInterval * 1000);
         }
+        /// Set the value for the severity of displayed logs to the command line value --severity
+        for (const auto& processorInfo : dataProcessorInfos) {
+          const auto& cmdLineArgs = processorInfo.cmdLineArgs;
+          if (std::find(cmdLineArgs.begin(), cmdLineArgs.end(), "--severity") != cmdLineArgs.end()) {
+            for (size_t counter = 0; const auto& spec : runningWorkflow.devices) {
+              if (spec.name.compare(processorInfo.name) == 0) {
+                auto& info = infos[counter];
+                const auto logLevelIt = std::find(cmdLineArgs.begin(), cmdLineArgs.end(), "--severity") + 1;
+                if ((*logLevelIt).compare("debug") == 0) {
+                  info.logLevel = LogParsingHelpers::LogLevel::Debug;
+                } else if ((*logLevelIt).compare("detail") == 0) {
+                  info.logLevel = LogParsingHelpers::LogLevel::Debug;
+                } else if ((*logLevelIt).compare("info") == 0) {
+                  info.logLevel = LogParsingHelpers::LogLevel::Info;
+                } else if ((*logLevelIt).compare("warning") == 0) {
+                  info.logLevel = LogParsingHelpers::LogLevel::Warning;
+                } else if ((*logLevelIt).compare("error") == 0) {
+                  info.logLevel = LogParsingHelpers::LogLevel::Error;
+                } else if ((*logLevelIt).compare("important") == 0) {
+                  info.logLevel = LogParsingHelpers::LogLevel::Info;
+                } else if ((*logLevelIt).compare("alarm") == 0) {
+                  info.logLevel = LogParsingHelpers::LogLevel::Alarm;
+                } else if ((*logLevelIt).compare("fatal") == 0) {
+                  info.logLevel = LogParsingHelpers::LogLevel::Fatal;
+                }
+                break;
+              }
+              ++counter;
+            }
+          }
+        }
         LOG(info) << "Redeployment of configuration done.";
       } break;
       case DriverState::RUNNING:

Framework/GUISupport/src/FrameworkGUIDebugger.cxx

@@ -142,24 +142,6 @@ void displayHistory(const DeviceInfo& info, DeviceControl& control)
     auto& line = info.history[ji];
     auto logLevel = info.historyLevel[ji];
 
-    // assign proper loglevel to ROOT log messages from stderr
-    auto getLogLevelUnknown = [&line]() -> LogParsingHelpers::LogLevel {
-      if (line.starts_with("Print in") || line.starts_with("Info in") || line.starts_with("[INFO]")) {
-        return LogParsingHelpers::LogLevel::Info;
-      } else if (line.starts_with("Warning in")) {
-        return LogParsingHelpers::LogLevel::Warning;
-      } else if (line.starts_with("Error in") || line.starts_with("SysError in")) {
-        return LogParsingHelpers::LogLevel::Error;
-      } else if (line.starts_with("Fatal in") || line.starts_with("*** Break ***")) {
-        return LogParsingHelpers::LogLevel::Fatal;
-      } else {
-        return LogParsingHelpers::LogLevel::Unknown;
-      }
-    };
-    if (logLevel == LogParsingHelpers::LogLevel::Unknown) {
-      logLevel = getLogLevelUnknown();
-    }
-
     // Skip empty lines
     if (line.empty()) {
       ji = (ji + 1) % historySize;