Skip to content

Commit 9dee03c

Browse files
authored
DPL: optimise mapping between FairLogger and InfoLogger (#13919)
1 parent 03ea86a commit 9dee03c

File tree

1 file changed

+60
-45
lines changed

1 file changed

+60
-45
lines changed

Framework/DataTakingSupport/src/Plugin.cxx

Lines changed: 60 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "Framework/RawDeviceService.h"
1717
#include "Framework/DeviceSpec.h"
1818
#include <InfoLogger/InfoLogger.hxx>
19+
#include <fairlogger/Logger.h>
1920
#include <fairmq/Device.h>
2021
#include <fairmq/shmem/Monitor.h>
2122
#include <fairmq/shmem/Common.h>
@@ -66,51 +67,65 @@ auto createInfoLoggerSinkHelper(InfoLogger* logger, InfoLoggerContext* ctx)
6667
InfoLogger::InfoLogger::Severity severity = InfoLogger::Severity::Undefined;
6768
int level = InfoLogger::undefinedMessageOption.level;
6869

69-
if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::nolog)) {
70-
// discard
71-
return;
72-
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::fatal)) {
73-
severity = InfoLogger::Severity::Fatal;
74-
level = 1;
75-
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::error)) {
76-
severity = InfoLogger::Severity::Error;
77-
level = 2;
78-
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::alarm)) {
79-
severity = InfoLogger::Severity::Warning;
80-
level = 6;
81-
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::important)) {
82-
severity = InfoLogger::Severity::Info;
83-
level = 7;
84-
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::warn)) {
85-
severity = InfoLogger::Severity::Warning;
86-
level = 11;
87-
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::state)) {
88-
severity = InfoLogger::Severity::Info;
89-
level = 12;
90-
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::info)) {
91-
severity = InfoLogger::Severity::Info;
92-
level = 13;
93-
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug)) {
94-
severity = InfoLogger::Severity::Debug;
95-
level = 14;
96-
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::detail)) {
97-
severity = InfoLogger::Severity::Debug;
98-
level = 15;
99-
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug1)) {
100-
severity = InfoLogger::Severity::Debug;
101-
level = 16;
102-
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug2)) {
103-
severity = InfoLogger::Severity::Debug;
104-
level = 17;
105-
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug3)) {
106-
severity = InfoLogger::Severity::Debug;
107-
level = 18;
108-
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::debug4)) {
109-
severity = InfoLogger::Severity::Debug;
110-
level = 19;
111-
} else if (metadata.severity_name == fair::Logger::SeverityName(fair::Severity::trace)) {
112-
severity = InfoLogger::Severity::Debug;
113-
level = 21;
70+
switch (metadata.severity) {
71+
case fair::Severity::fatal:
72+
severity = InfoLogger::Severity::Fatal;
73+
level = 1;
74+
break;
75+
case fair::Severity::error:
76+
severity = InfoLogger::Severity::Error;
77+
level = 2;
78+
break;
79+
case fair::Severity::alarm:
80+
severity = InfoLogger::Severity::Warning;
81+
level = 6;
82+
break;
83+
case fair::Severity::important:
84+
severity = InfoLogger::Severity::Info;
85+
level = 7;
86+
break;
87+
case fair::Severity::warn:
88+
severity = InfoLogger::Severity::Warning;
89+
level = 11;
90+
break;
91+
case fair::Severity::state:
92+
severity = InfoLogger::Severity::Info;
93+
level = 12;
94+
break;
95+
case fair::Severity::info:
96+
severity = InfoLogger::Severity::Info;
97+
level = 13;
98+
break;
99+
case fair::Severity::debug:
100+
severity = InfoLogger::Severity::Debug;
101+
level = 14;
102+
break;
103+
case fair::Severity::detail:
104+
severity = InfoLogger::Severity::Debug;
105+
level = 15;
106+
break;
107+
case fair::Severity::debug1:
108+
severity = InfoLogger::Severity::Debug;
109+
level = 16;
110+
break;
111+
case fair::Severity::debug2:
112+
severity = InfoLogger::Severity::Debug;
113+
level = 17;
114+
break;
115+
case fair::Severity::debug3:
116+
severity = InfoLogger::Severity::Debug;
117+
level = 18;
118+
break;
119+
case fair::Severity::debug4:
120+
severity = InfoLogger::Severity::Debug;
121+
level = 19;
122+
break;
123+
case fair::Severity::trace:
124+
severity = InfoLogger::Severity::Debug;
125+
level = 21;
126+
break;
127+
case fair::Severity::nolog: // discard
128+
return;
114129
}
115130

116131
InfoLogger::InfoLoggerMessageOption opt = {

0 commit comments

Comments
 (0)