From 0208565f8d11ffe017ad93e3a155289fa40afbb1 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Tue, 22 Jun 2021 10:11:33 +0200 Subject: [PATCH 1/4] DPL: provide level everywhere when mapping FairLogger to InfoLogger --- Framework/Core/src/CommonServices.cxx | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Framework/Core/src/CommonServices.cxx b/Framework/Core/src/CommonServices.cxx index 4c3f2361a3e75..9f15faa52aa87 100644 --- a/Framework/Core/src/CommonServices.cxx +++ b/Framework/Core/src/CommonServices.cxx @@ -192,39 +192,43 @@ auto createInfoLoggerSinkHelper(InfoLogger* logger, InfoLoggerContext* ctx) ctx](const std::string& content, const fair::LogMetaData& metadata) { // translate FMQ metadata InfoLogger::InfoLogger::Severity severity = InfoLogger::Severity::Undefined; - int level = InfoLogger::undefinedMessageOption.level; if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::nolog)) { // discard return; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::fatal)) { severity = InfoLogger::Severity::Fatal; + level = 10; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::error)) { severity = InfoLogger::Severity::Error; + level = 20; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::warn)) { severity = InfoLogger::Severity::Warning; + level = 30; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::state)) { severity = InfoLogger::Severity::Info; - level = 10; + level = 40; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::info)) { severity = InfoLogger::Severity::Info; + level = 50; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug)) { severity = InfoLogger::Severity::Debug; + level = 60; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug1)) { severity = InfoLogger::Severity::Debug; - level = 10; + level = 61; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug2)) { severity = InfoLogger::Severity::Debug; - level = 20; + level = 62; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug3)) { severity = InfoLogger::Severity::Debug; - level = 30; + level = 63; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug4)) { severity = InfoLogger::Severity::Debug; - level = 40; + level = 64; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::trace)) { severity = InfoLogger::Severity::Debug; - level = 50; + level = 65; } InfoLogger::InfoLoggerMessageOption opt = { From 0ffd3e2acd4f8f2d526ee51aa3154c87569d4aab Mon Sep 17 00:00:00 2001 From: David Rohr Date: Tue, 22 Jun 2021 10:20:34 +0200 Subject: [PATCH 2/4] Adapt the levels tried to match them to the guidelines in https://alice-flp.docs.cern.ch/InfoLogger/ --- Framework/Core/src/CommonServices.cxx | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Framework/Core/src/CommonServices.cxx b/Framework/Core/src/CommonServices.cxx index 9f15faa52aa87..d550d02e37b3c 100644 --- a/Framework/Core/src/CommonServices.cxx +++ b/Framework/Core/src/CommonServices.cxx @@ -198,37 +198,37 @@ auto createInfoLoggerSinkHelper(InfoLogger* logger, InfoLoggerContext* ctx) return; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::fatal)) { severity = InfoLogger::Severity::Fatal; - level = 10; + level = 1; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::error)) { severity = InfoLogger::Severity::Error; - level = 20; + level = 2; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::warn)) { severity = InfoLogger::Severity::Warning; - level = 30; + level = 3; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::state)) { severity = InfoLogger::Severity::Info; - level = 40; + level = 5; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::info)) { severity = InfoLogger::Severity::Info; - level = 50; + level = 7; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug)) { severity = InfoLogger::Severity::Debug; - level = 60; + level = 10; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug1)) { severity = InfoLogger::Severity::Debug; - level = 61; + level = 12; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug2)) { severity = InfoLogger::Severity::Debug; - level = 62; + level = 14; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug3)) { severity = InfoLogger::Severity::Debug; - level = 63; + level = 16; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug4)) { severity = InfoLogger::Severity::Debug; - level = 64; + level = 18; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::trace)) { severity = InfoLogger::Severity::Debug; - level = 65; + level = 50; } InfoLogger::InfoLoggerMessageOption opt = { From 44d413eb00ae186777ad50e44661022848506b17 Mon Sep 17 00:00:00 2001 From: David Rohr Date: Tue, 22 Jun 2021 16:46:40 +0200 Subject: [PATCH 3/4] Update CommonServices.cxx --- Framework/Core/src/CommonServices.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Framework/Core/src/CommonServices.cxx b/Framework/Core/src/CommonServices.cxx index d550d02e37b3c..04ba50f0f2422 100644 --- a/Framework/Core/src/CommonServices.cxx +++ b/Framework/Core/src/CommonServices.cxx @@ -201,31 +201,31 @@ auto createInfoLoggerSinkHelper(InfoLogger* logger, InfoLoggerContext* ctx) level = 1; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::error)) { severity = InfoLogger::Severity::Error; - level = 2; + level = 3; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::warn)) { severity = InfoLogger::Severity::Warning; - level = 3; + level = 6; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::state)) { severity = InfoLogger::Severity::Info; - level = 5; + level = 8; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::info)) { severity = InfoLogger::Severity::Info; - level = 7; + level = 10; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug)) { severity = InfoLogger::Severity::Debug; - level = 10; + level = 11; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug1)) { severity = InfoLogger::Severity::Debug; level = 12; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug2)) { severity = InfoLogger::Severity::Debug; - level = 14; + level = 13; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug3)) { severity = InfoLogger::Severity::Debug; - level = 16; + level = 14; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug4)) { severity = InfoLogger::Severity::Debug; - level = 18; + level = 15; } else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::trace)) { severity = InfoLogger::Severity::Debug; level = 50; From 9cfce9353c73a4f9acff1e74e803fd9dbc38929d Mon Sep 17 00:00:00 2001 From: David Rohr Date: Tue, 22 Jun 2021 17:54:35 +0200 Subject: [PATCH 4/4] fix compilation --- Framework/Core/src/CommonServices.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Framework/Core/src/CommonServices.cxx b/Framework/Core/src/CommonServices.cxx index 04ba50f0f2422..0bedaa003ad75 100644 --- a/Framework/Core/src/CommonServices.cxx +++ b/Framework/Core/src/CommonServices.cxx @@ -192,6 +192,7 @@ auto createInfoLoggerSinkHelper(InfoLogger* logger, InfoLoggerContext* ctx) ctx](const std::string& content, const fair::LogMetaData& metadata) { // translate FMQ metadata InfoLogger::InfoLogger::Severity severity = InfoLogger::Severity::Undefined; + int level = InfoLogger::undefinedMessageOption.level; if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::nolog)) { // discard