commit to synchronize

Author: ehellbar

Detectors/CTF/workflow/src/CTFReaderSpec.cxx

@@ -200,6 +200,12 @@ void CTFReaderSpec::run(ProcessingContext& pc)
   bool waitAcknowledged = false;
   long startWait = 0;
 
+  fprintf(stderr, "Warning in <CTFReaderSpec>: this is a test warning message.\n");
+  fprintf(stderr, "SysError in <CTFReaderSpec>: this is a test warning message.\n");
+  fprintf(stderr, "Print in <CTFReaderSpec>: this is a test warning message.\n");
+  fprintf(stderr, "Fatal in <CTFReaderSpec>: this is a test warning message.\n");
+  fprintf(stderr, "*** Break ***\n");
+
   while (mRunning) {
     if (mCTFTree) { // there is a tree open with multiple CTF
       if (mInput.ctfIDs.empty() || mInput.ctfIDs[mSelIDEntry] == mCTFCounter) { // no selection requested or matching CTF ID is found

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,6 +24,15 @@ 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 = {
+  {"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}};
+
 LogLevel LogParsingHelpers::parseTokenLevel(std::string_view const s)
 {
 
@@ -41,6 +50,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

@@ -891,7 +891,9 @@ void processChildrenOutput(uv_loop_t* loop,
         info.history[info.historyPos] = token;
         info.historyLevel[info.historyPos] = logLevel;
         info.historyPos = (info.historyPos + 1) % info.history.size();
-        fmt::print("[{}:{}]: {}\n", info.pid, spec.id, token);
+        fmt::print("{}", (int)control.logLevel);
+        fmt::print("{}", control.logFilter);
+        fmt::print("{} [{}:{}]: {}\n", (int)logLevel, info.pid, spec.id, token);
       }
       // We keep track of the maximum log error a
       // device has seen.