Skip to content

Commit d74db4c

Browse files
committed
updated FMQ severities
1 parent 817b914 commit d74db4c

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

doc/releaseNotes.md

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

136136
## v2.5.3 - 24/10/2022
137137
- Common/SimpleLog update: fiterDiscardSetFile / rotateMaxFiles parameter: If one, a single file is created and cleared immediately, and messages are discarded after reaching rotateMaxBytes.
138+
139+
## v2.5.4 - 09/10/2023
140+
- Updated InfoLoggerFMQ.hxx with new FMQ severities.

include/InfoLogger/InfoLoggerFMQ.hxx

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ void setFMQLogsToInfoLogger(AliceO2::InfoLogger::InfoLogger* logPtr = nullptr)
4242
// translate FMQ metadata
4343
AliceO2::InfoLogger::InfoLogger::InfoLogger::Severity severity = AliceO2::InfoLogger::InfoLogger::Severity::Undefined;
4444
int level = AliceO2::InfoLogger::InfoLogger::undefinedMessageOption.level;
45+
const char *prefix = NULL;
4546

4647
if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::nolog)) {
4748
// discard
@@ -50,13 +51,23 @@ void setFMQLogsToInfoLogger(AliceO2::InfoLogger::InfoLogger* logPtr = nullptr)
5051
severity = AliceO2::InfoLogger::InfoLogger::Severity::Fatal;
5152
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::error)) {
5253
severity = AliceO2::InfoLogger::InfoLogger::Severity::Error;
54+
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::alarm)) {
55+
severity = AliceO2::InfoLogger::InfoLogger::Severity::Info;
56+
prefix = "Alarm";
57+
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::important)) {
58+
severity = AliceO2::InfoLogger::InfoLogger::Severity::Info;
59+
prefix = "Important";
5360
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::warn)) {
5461
severity = AliceO2::InfoLogger::InfoLogger::Severity::Warning;
5562
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::state)) {
5663
severity = AliceO2::InfoLogger::InfoLogger::Severity::Info;
5764
level = 10;
65+
prefix = "State";
5866
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::info)) {
5967
severity = AliceO2::InfoLogger::InfoLogger::Severity::Info;
68+
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::detail)) {
69+
severity = AliceO2::InfoLogger::InfoLogger::Severity::Info;
70+
level = 10;
6071
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug)) {
6172
severity = AliceO2::InfoLogger::InfoLogger::Severity::Debug;
6273
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug1)) {
@@ -83,7 +94,11 @@ void setFMQLogsToInfoLogger(AliceO2::InfoLogger::InfoLogger* logPtr = nullptr)
8394
metadata.file.c_str(),
8495
atoi(metadata.line.c_str())
8596
};
86-
theLogPtr->log(opt, ctx, "FMQ: %s", content.c_str());
97+
if (prefix == NULL) {
98+
theLogPtr->log(opt, ctx, "FMQ: %s", content.c_str());
99+
} else {
100+
theLogPtr->log(opt, ctx, "FMQ: %s - %s", prefix, content.c_str());
101+
}
87102
});
88103

89104
fair::Logger::SetCustomSeverity(INFOLOGGER_FMQ_SINK_NAME, fair::Logger::GetConsoleSeverity());

0 commit comments

Comments
 (0)