Merge pull request #96 from sy-c/master

v2.8.0

Author: sy-c

doc/releaseNotes.md

@@ -162,3 +162,6 @@ This file describes the main feature changes for each InfoLogger released versio
 
 # v2.7.3 - 30/09/2024
 - o2-infologger-daemon: removed limitation of 1024 connections (was because of hard limit in select() system call, replaced now by poll()).
+
+# v2.8.0 - 18/02/2024
+- API : adapted InfoLoggerFMQ.hxx for compatibility with FairLogger 2.1.0

include/InfoLogger/InfoLoggerFMQ.hxx

@@ -12,7 +12,7 @@
 #ifndef INFOLOGGER_INFOLOGGERFMQ_HXX
 #define INFOLOGGER_INFOLOGGERFMQ_HXX
 
-#include <fairmq/FairMQLogger.h>
+#include <Logger.h>
 #include <InfoLogger/InfoLogger.hxx>
 
 #define INFOLOGGER_FMQ_SINK_NAME "infoLogger"
@@ -49,6 +49,9 @@ void setFMQLogsToInfoLogger(AliceO2::InfoLogger::InfoLogger* logPtr = nullptr)
         return;
       } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::fatal)) {
         severity = AliceO2::InfoLogger::InfoLogger::Severity::Fatal;
+      } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::critical)) {
+        severity = AliceO2::InfoLogger::InfoLogger::Severity::Error;
+        prefix = "Critical";
       } 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)) {
@@ -91,8 +94,8 @@ void setFMQLogsToInfoLogger(AliceO2::InfoLogger::InfoLogger* logPtr = nullptr)
         severity,
         level,
         AliceO2::InfoLogger::InfoLogger::undefinedMessageOption.errorCode,
-        metadata.file.c_str(),
-        atoi(metadata.line.c_str())
+        std::string(metadata.file).c_str(),
+        atoi(std::string(metadata.line).c_str())
       };
       if (prefix == NULL) {
         theLogPtr->log(opt, ctx, "FMQ: %s", content.c_str());

src/ConfigInfoLoggerServer.cxx

@@ -34,6 +34,8 @@ void ConfigInfoLoggerServer::readFromConfigFile(ConfigFile& config)
   config.getOptionalValue<int>(INFOLOGGER_CONFIG_SECTION_NAME_SERVER ".dbNThreads", dbNThreads);
   config.getOptionalValue<int>(INFOLOGGER_CONFIG_SECTION_NAME_SERVER ".dbDispatchQueueSize", dbDispatchQueueSize);
 
+  config.getOptionalValue<std::string>(INFOLOGGER_CONFIG_SECTION_NAME_SERVER ".dbReplica", dbReplica);
+
   config.getOptionalValue<int>(INFOLOGGER_CONFIG_SECTION_NAME_SERVER ".serverPortTx", serverPortTx);
   config.getOptionalValue<int>(INFOLOGGER_CONFIG_SECTION_NAME_SERVER ".maxClientsTx", maxClientsTx);
 }

src/ConfigInfoLoggerServer.h

@@ -45,6 +45,8 @@ class ConfigInfoLoggerServer
   int dbNThreads = 1;                // number of insert threads
   int dbDispatchQueueSize = 10000;   // max number of messages buffered in memory before DB insert
 
+  std::string dbReplica = "";        // path to a infologgerserver config file, from which the database settings are read and to which a copy of the messages will be stored
+
   // settings for infoBrowser clients
   int serverPortTx = INFOLOGGER_DEFAULT_SERVER_TX_PORT;
   int maxClientsTx = 100;

src/InfoLoggerMessageList.cxx

@@ -25,3 +25,11 @@ InfoLoggerMessageList::~InfoLoggerMessageList()
   infoLog_msg_destroy(msg); // destroy list (ok with null)
 }
 
+unsigned long InfoLoggerMessageList::size()
+{
+  unsigned long nMsg = 0;
+  for (infoLog_msg_t* m = this->msg; m != nullptr; m = m->next) {
+    nMsg++;
+  }
+  return nMsg;
+}

src/InfoLoggerMessageList.h

@@ -21,6 +21,7 @@ class InfoLoggerMessageList
   InfoLoggerMessageList(TR_file* rawMessageList);
   ~InfoLoggerMessageList();
   infoLog_msg_t* msg;
+  unsigned long size(); // return number of messages in list
 };
 
 // _INFOLOGGER_MESSAGE_LIST_H

test/testInfoLogger.cxx

@@ -23,6 +23,13 @@ using namespace AliceO2::InfoLogger;
 
 int main()
 {
+  if (0) {
+    InfoLogger theLog("verbose=1");
+    theLog.log("infoLogger message test");
+    sleep(1);
+    return 0;
+  }
+
   InfoLogger theLog;
 
   if (0) {