Merge pull request #88 from sy-c/master

v2.5.4

Author: sy-c

doc/releaseNotes.md

@@ -135,3 +135,6 @@ This file describes the main feature changes for each InfoLogger released versio
 
 ## v2.5.3 - 24/10/2022
 - Common/SimpleLog update: fiterDiscardSetFile / rotateMaxFiles parameter: If one, a single file is created and cleared immediately, and messages are discarded after reaching rotateMaxBytes.
+
+## v2.5.4 - 09/10/2023
+- Updated InfoLoggerFMQ.hxx with new FMQ severities.

include/InfoLogger/InfoLoggerFMQ.hxx

@@ -42,6 +42,7 @@ void setFMQLogsToInfoLogger(AliceO2::InfoLogger::InfoLogger* logPtr = nullptr)
       // translate FMQ metadata
       AliceO2::InfoLogger::InfoLogger::InfoLogger::Severity severity = AliceO2::InfoLogger::InfoLogger::Severity::Undefined;
       int level = AliceO2::InfoLogger::InfoLogger::undefinedMessageOption.level;
+      const char *prefix = NULL;
 
       if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::nolog)) {
         // discard
@@ -50,13 +51,23 @@ void setFMQLogsToInfoLogger(AliceO2::InfoLogger::InfoLogger* logPtr = nullptr)
         severity = AliceO2::InfoLogger::InfoLogger::Severity::Fatal;
       } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::error)) {
         severity = AliceO2::InfoLogger::InfoLogger::Severity::Error;
+      } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::alarm)) {
+        severity = AliceO2::InfoLogger::InfoLogger::Severity::Info;
+        prefix = "Alarm";
+      } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::important)) {
+        severity = AliceO2::InfoLogger::InfoLogger::Severity::Info;
+        prefix = "Important";
       } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::warn)) {
         severity = AliceO2::InfoLogger::InfoLogger::Severity::Warning;
       } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::state)) {
         severity = AliceO2::InfoLogger::InfoLogger::Severity::Info;
         level = 10;
+        prefix = "State";
       } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::info)) {
         severity = AliceO2::InfoLogger::InfoLogger::Severity::Info;
+      } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::detail)) {
+        severity = AliceO2::InfoLogger::InfoLogger::Severity::Info;
+        level = 10;
       } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug)) {
         severity = AliceO2::InfoLogger::InfoLogger::Severity::Debug;
       } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug1)) {
@@ -83,7 +94,11 @@ void setFMQLogsToInfoLogger(AliceO2::InfoLogger::InfoLogger* logPtr = nullptr)
         metadata.file.c_str(),
         atoi(metadata.line.c_str())
       };
-      theLogPtr->log(opt, ctx, "FMQ: %s", content.c_str());
+      if (prefix == NULL) {
+        theLogPtr->log(opt, ctx, "FMQ: %s", content.c_str());
+      } else {
+        theLogPtr->log(opt, ctx, "FMQ: %s - %s", prefix, content.c_str());
+      }
     });
 
   fair::Logger::SetCustomSeverity(INFOLOGGER_FMQ_SINK_NAME, fair::Logger::GetConsoleSeverity());

src/infoLoggerD.cxx

@@ -147,7 +147,7 @@ int checkDirAndCreate(const char* dir, SimpleLog* log = NULL)
   }
 
   // check directory tree
-  int i, j;
+  unsigned int i, j;
   for (i = strlen(dir); i >= 0; i--) {
     if (dir[i] == '/') {
       if (i > 0) {
@@ -158,6 +158,9 @@ int checkDirAndCreate(const char* dir, SimpleLog* log = NULL)
       break;
     }
   }
+  if (i >= PATH_MAX) {
+    return -1;
+  }
   for (j = 0; j < i; j++) {
     path[j] = dir[j];
   }

test/testInfoLogger.c

@@ -15,8 +15,6 @@
 
 #include <InfoLogger/InfoLogger.h>
 
-#define _BSD_SOURCE
-
 #include <stdio.h>
 #include <unistd.h>
 

test/testInfoLoggerDB.cxx

@@ -15,6 +15,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <time.h>
 
 #if LIBMYSQL_VERSION_ID >= 80000
 typedef bool my_bool;