DPL: assign proper log level for ROOT log messages from stderr in terminal output

Author: ehellbar

Framework/Core/include/Framework/LogParsingHelpers.h

@@ -11,6 +11,7 @@
 #ifndef O2_FRAMEWORK_LOGPARSINGHELPERS_H_
 #define O2_FRAMEWORK_LOGPARSINGHELPERS_H_
 
+#include <map>
 #include <string>
 #include <string_view>
 
@@ -34,6 +35,9 @@ struct LogParsingHelpers {
   /// Available log levels
   static char const* const LOG_LEVELS[(int)LogLevel::Size];
 
+  /// Map from ROOT log string to log level
+  static const std::map<std::string, LogLevel> MAP_ROOT_LOG_LEVELS;
+
   /// Extract the log style from a log string @param s
   /// Token style can then be used for colouring the logs
   /// in the GUI or to exit with error if a sufficient

Framework/Core/src/LogParsingHelpers.cxx

@@ -24,13 +24,24 @@ char const* const LogParsingHelpers::LOG_LEVELS[(int)LogParsingHelpers::LogLevel
   "UNKNOWN"};
 using LogLevel = o2::framework::LogParsingHelpers::LogLevel;
 
+const std::map<std::string, LogLevel> LogParsingHelpers::MAP_ROOT_LOG_LEVELS = {
+  {"[INFO]", LogLevel::Info},
+  {"Print in <", LogLevel::Info},
+  {"Info in <", LogLevel::Info},
+  {"Warning in <", LogLevel::Warning},
+  {"Error in <", LogLevel::Error},
+  {"SysError in <", LogLevel::Error},
+  {"Fatal in <", LogLevel::Fatal},
+  {"*** Break ***", LogLevel::Fatal},
+  {" *** Break ***", LogLevel::Fatal}};
+
 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.compare("[INFO]") != 0) {
     return LogLevel::Unknown;
   }
 
@@ -41,6 +52,11 @@ 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) {
+    for (const auto& level : LogParsingHelpers::MAP_ROOT_LOG_LEVELS) {
+      if (s.starts_with(level.first)) {
+        return level.second;
+      }
+    }
     return LogLevel::Unknown;
   }
 

Framework/Core/src/runDataProcessing.cxx

@@ -2016,6 +2016,30 @@ int runStateMachine(DataProcessorSpecs const& workflow,
               control.tracingFlags = tracingFlags;
             }
           }
+          /// Set the value for logging severity to the command line value --severity
+          if (varmap.count("severity")) {
+            auto logLevel = varmap["severity"].as<std::string>();
+            for (auto& control : controls) {
+              if (logLevel == "debug") {
+                control.logLevel = LogParsingHelpers::LogLevel::Debug;
+              } else if (logLevel == "detail") {
+                control.logLevel = LogParsingHelpers::LogLevel::Debug;
+              } else if (logLevel == "info") {
+                control.logLevel = LogParsingHelpers::LogLevel::Info;
+              } else if (logLevel == "warning") {
+                control.logLevel = LogParsingHelpers::LogLevel::Warning;
+              } else if (logLevel == "error") {
+                control.logLevel = LogParsingHelpers::LogLevel::Error;
+              } else if (logLevel == "important") {
+                control.logLevel = LogParsingHelpers::LogLevel::Info;
+              } else if (logLevel == "alarm") {
+                control.logLevel = LogParsingHelpers::LogLevel::Alarm;
+              } else if (logLevel == "fatal") {
+                control.logLevel = LogParsingHelpers::LogLevel::Fatal;
+              }
+            }
+          }
+
           deviceExecutions.resize(runningWorkflow.devices.size());
 
           // Options which should be uniform across all

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;