Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 16:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small adjustments for the new logger.

Browse Source 
Both FairMQLogger and FairMQStateMachine use Boost Fusion internaly.
Because the state machine needs FUSION_MAX_VECTOR_SIZE 20 defined,
same value has to be defined in the logger, otherwise Fusion is not
properly compiled.
This commit is contained in:
Alexey Rybalchenko 2015-09-11 15:38:16 +02:00 committed by Mohammad Al-Turany
parent 5136c88d3a
commit 54e1777c00
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fairmq/logger/logger.h
View File

@ -15,6 +15,7 @@
#define LOGGER_H
#define BOOST_LOG_DYN_LINK 1 // necessary when linking the boost_log library dynamically
#define FUSION_MAX_VECTOR_SIZE 20
// std
#include <type_traits>

4
fairmq/options/FairMQParser.cxx
View File

@ -13,7 +13,7 @@
*/
#include "FairMQParser.h"
#include "FairLogger.h"
#include "FairMQLogger.h"
#include <boost/property_tree/xml_parser.hpp>
// WARNING : pragma commands to hide boost (1.54.0) warning
@ -171,7 +171,7 @@ FairMQMap ptreeToMQMap(const boost::property_tree::ptree& pt, const string& devi
if (channelMap.size() > 0)
{
LOG(DEBUG) << "---- Channel-keys found are :";
for (const auto& p : MQChannelMap)
for (const auto& p : channelMap)
{
LOG(DEBUG) << p.first;
}

6
fairmq/options/FairMQProgOptions.cxx
View File

@ -62,14 +62,14 @@ int FairMQProgOptions::ParseAll(const int argc, char** argv, bool allowUnregiste
// set log level before printing (default is 0 = DEBUG level)
std::string verbose=GetValue<std::string>("verbose");
//SET_LOG_LEVEL(DEBUG);
if (fSeverity_map.count(verbose))
if (fSeverityMap.count(verbose))
{
set_global_log_level(log_op::operation::GREATER_EQ_THAN,fSeverity_map.at(verbose));
set_global_log_level(log_op::operation::GREATER_EQ_THAN,fSeverityMap.at(verbose));
}
else
{
LOG(ERROR)<<" verbosity level '"<<verbose<<"' unknown, it will be set to INFO";
set_global_log_level(log_op::operation::GREATER_EQ_THAN,fSeverity_map.at("RESULTS"));
set_global_log_level(log_op::operation::GREATER_EQ_THAN,fSeverityMap.at("RESULTS"));
}
PrintOptions();

16
fairmq/options/FairProgOptions.cxx
View File

@ -44,14 +44,14 @@ FairProgOptions::FairProgOptions() :
)
;
fSeverity_map["TRACE"] = fairmq::severity_level::TRACE;
fSeverity_map["DEBUG"] = fairmq::severity_level::DEBUG;
fSeverity_map["RESULTS"] = fairmq::severity_level::RESULTS;
fSeverity_map["INFO"] = fairmq::severity_level::INFO;
fSeverity_map["WARN"] = fairmq::severity_level::WARN;
fSeverity_map["ERROR"] = fairmq::severity_level::ERROR;
fSeverity_map["STATE"] = fairmq::severity_level::STATE;
fSeverity_map["NOLOG"] = fairmq::severity_level::NOLOG;
fSeverityMap["TRACE"] = fairmq::severity_level::TRACE;
fSeverityMap["DEBUG"] = fairmq::severity_level::DEBUG;
fSeverityMap["RESULTS"] = fairmq::severity_level::RESULTS;
fSeverityMap["INFO"] = fairmq::severity_level::INFO;
fSeverityMap["WARN"] = fairmq::severity_level::WARN;
fSeverityMap["ERROR"] = fairmq::severity_level::ERROR;
fSeverityMap["STATE"] = fairmq::severity_level::STATE;
fSeverityMap["NOLOG"] = fairmq::severity_level::NOLOG;
}
/// Destructor