Skip to content

Set InfoLogger message levels in addition to severity #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lkrcal merged 1 commit into from
May 15, 2023
Merged

Set InfoLogger message levels in addition to severity #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/common/base/DataDistLogger.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ std::thread impl::DataDistLoggerCtx::sRateUpdateThread;
std::thread impl::DataDistLoggerCtx::mInfoLoggerThread;


std::unique_ptr<ConcurrentFifo<std::tuple<AliceO2::InfoLogger::InfoLogger::Severity, std::string>>>
std::unique_ptr<ConcurrentFifo<std::tuple<AliceO2::InfoLogger::InfoLogger::InfoLoggerMessageOption, std::string>>>
DataDistLogger::sInfoLogQueue = nullptr;


Expand Down
21 changes: 11 additions & 10 deletions src/common/base/DataDistLogger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <fairlogger/Logger.h>

#include <InfoLogger/InfoLogger.hxx>
#include <InfoLogger/InfoLoggerMacros.hxx>
#include <boost/program_options/options_description.hpp>

#if defined(__linux__)
Expand Down Expand Up @@ -123,7 +124,7 @@ class DataDistLogger {

if (InfoLogEnabled(mSeverity)) {
sInfoLogQueue->push_capacity(cInfoLoggerQueueSize,
std::make_tuple(AliceO2::InfoLogger::InfoLogger::Severity::Fatal,
std::make_tuple(LogFatalOps,
std::string(std::string_view(mLogMessage.begin(), mLogMessage.size()))
));
}
Expand All @@ -135,7 +136,7 @@ class DataDistLogger {

if (InfoLogEnabled(mSeverity)) {
sInfoLogQueue->push_capacity(cInfoLoggerQueueSize,
std::make_tuple(AliceO2::InfoLogger::InfoLogger::Severity::Error,
std::make_tuple(LogErrorOps,
std::string(std::string_view(mLogMessage.begin(), mLogMessage.size()))
));
}
Expand All @@ -148,7 +149,7 @@ class DataDistLogger {

if (InfoLogEnabled(mSeverity)) {
sInfoLogQueue->push_capacity(cInfoLoggerQueueSize,
std::make_tuple(AliceO2::InfoLogger::InfoLogger::Severity::Warning,
std::make_tuple(LogWarningSupport,
std::string(std::string_view(mLogMessage.begin(), mLogMessage.size()))
));
}
Expand All @@ -161,7 +162,7 @@ class DataDistLogger {

if (InfoLogEnabled(mSeverity)) {
sInfoLogQueue->push_capacity(cInfoLoggerQueueSize,
std::make_tuple(AliceO2::InfoLogger::InfoLogger::Severity::Info,
std::make_tuple(LogInfoDevel,
std::string(std::string_view(mLogMessage.begin(), mLogMessage.size()))
));
}
Expand All @@ -174,7 +175,7 @@ class DataDistLogger {

if (InfoLogEnabled(mSeverity)) {
sInfoLogQueue->push_capacity(cInfoLoggerQueueSize,
std::make_tuple(AliceO2::InfoLogger::InfoLogger::Severity::Info,
std::make_tuple(LogInfoDevel,
std::string(std::string_view(mLogMessage.begin(), mLogMessage.size()))
));
}
Expand All @@ -187,7 +188,7 @@ class DataDistLogger {

if (InfoLogEnabled(mSeverity)) {
sInfoLogQueue->push_capacity(cInfoLoggerQueueSize,
std::make_tuple(AliceO2::InfoLogger::InfoLogger::Severity::Debug,
std::make_tuple(LogDebugDevel,
std::string(std::string_view(mLogMessage.begin(), mLogMessage.size()))
));
}
Expand All @@ -200,7 +201,7 @@ class DataDistLogger {

if (InfoLogEnabled(mSeverity)) {
sInfoLogQueue->push_capacity(cInfoLoggerQueueSize,
std::make_tuple(AliceO2::InfoLogger::InfoLogger::Severity::Debug,
std::make_tuple(LogDebugTrace,
std::string(std::string_view(mLogMessage.begin(), mLogMessage.size()))
));
}
Expand Down Expand Up @@ -233,7 +234,7 @@ class DataDistLogger {
bool LogEnabled(const DataDistSeverity pSevVal) { return (InfoLogEnabled(pSevVal) || StdoutEnabled(pSevVal)); }

// InfoLogger queue
static std::unique_ptr<ConcurrentFifo<std::tuple<AliceO2::InfoLogger::InfoLogger::Severity, std::string>>> sInfoLogQueue;
static std::unique_ptr<ConcurrentFifo<std::tuple<AliceO2::InfoLogger::InfoLogger::InfoLoggerMessageOption, std::string>>> sInfoLogQueue;

private:

Expand Down Expand Up @@ -345,7 +346,7 @@ struct DataDistLoggerCtx {
sRunning = true;

DataDistLogger::sInfoLogQueue =
std::make_unique<ConcurrentFifo<std::tuple<AliceO2::InfoLogger::InfoLogger::Severity, std::string>>>();
std::make_unique<ConcurrentFifo<std::tuple<AliceO2::InfoLogger::InfoLogger::InfoLoggerMessageOption, std::string>>>();

fair::Logger::SetConsoleSeverity(fair::Severity::nolog);
fair::Logger::SetFileSeverity(fair::Severity::nolog);
Expand Down Expand Up @@ -374,7 +375,7 @@ struct DataDistLoggerCtx {
pthread_setname_np(pthread_self(), "infolog");
#endif

std::tuple<AliceO2::InfoLogger::InfoLogger::Severity, std::string> lLogVal;
std::tuple<AliceO2::InfoLogger::InfoLogger::InfoLoggerMessageOption, std::string> lLogVal;

while (sRunning) {
if( DataDistLogger::sInfoLogQueue->pop(lLogVal) ){
Expand Down