Skip to content

Commit 940fefa

Browse files
committed
adapted to FMQ 2.1.0
1 parent 595d1bc commit 940fefa

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

doc/releaseNotes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,3 +162,6 @@ This file describes the main feature changes for each InfoLogger released versio
162162

163163
# v2.7.3 - 30/09/2024
164164
- o2-infologger-daemon: removed limitation of 1024 connections (was because of hard limit in select() system call, replaced now by poll()).
165+
166+
# v2.8.0 - 18/02/2024
167+
- API : adapted InfoLoggerFMQ.hxx for compatibility with FairLogger 2.1.0

include/InfoLogger/InfoLoggerFMQ.hxx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#ifndef INFOLOGGER_INFOLOGGERFMQ_HXX
1313
#define INFOLOGGER_INFOLOGGERFMQ_HXX
1414

15-
#include <fairmq/FairMQLogger.h>
15+
#include <Logger.h>
1616
#include <InfoLogger/InfoLogger.hxx>
1717

1818
#define INFOLOGGER_FMQ_SINK_NAME "infoLogger"
@@ -49,6 +49,9 @@ void setFMQLogsToInfoLogger(AliceO2::InfoLogger::InfoLogger* logPtr = nullptr)
4949
return;
5050
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::fatal)) {
5151
severity = AliceO2::InfoLogger::InfoLogger::Severity::Fatal;
52+
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::critical)) {
53+
severity = AliceO2::InfoLogger::InfoLogger::Severity::Error;
54+
prefix = "Critical";
5255
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::error)) {
5356
severity = AliceO2::InfoLogger::InfoLogger::Severity::Error;
5457
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::alarm)) {
@@ -91,8 +94,8 @@ void setFMQLogsToInfoLogger(AliceO2::InfoLogger::InfoLogger* logPtr = nullptr)
9194
severity,
9295
level,
9396
AliceO2::InfoLogger::InfoLogger::undefinedMessageOption.errorCode,
94-
metadata.file.c_str(),
95-
atoi(metadata.line.c_str())
97+
std::string(metadata.file).c_str(),
98+
atoi(std::string(metadata.line).c_str())
9699
};
97100
if (prefix == NULL) {
98101
theLogPtr->log(opt, ctx, "FMQ: %s", content.c_str());

0 commit comments

Comments
 (0)