Skip to content

Commit 35b0a39

Browse files
committed
added readout.fairmqConsoleSeverity
1 parent e36a22b commit 35b0a39

File tree

4 files changed

+17
-0
lines changed

4 files changed

+17
-0
lines changed

doc/configurationParameters.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ The parameters related to 3rd-party libraries are described here for convenience
161161
| readout | disableAggregatorSlicing | int | 0 | When set, the aggregator slicing is disabled, data pages are passed through without grouping/slicing. |
162162
| readout | disableTimeframes | int | 0 | When set, all timeframe related features are disabled (this may supersede other config parameters). |
163163
| readout | exitTimeout | double | -1 | Time in seconds after which the program exits automatically. -1 for unlimited. |
164+
| readout | fairmqConsoleSeverity | int | -1 | Select amount of FMQ messages with fair::Logger::SetConsoleSeverity(). Value as defined in Severity enum defined from FairLogger/Logger.h. Use -1 to leave current setting. |
164165
| readout | flushConsumerTimeout | double | 1 | Time in seconds to wait before stopping the consumers (ie wait allocated pages released). 0 means stop immediately. |
165166
| readout | flushEquipmentTimeout | double | 1 | Time in seconds to wait for data once the equipments are stopped. 0 means stop immediately. |
166167
| readout | logbookApiToken | string | | The token to be used for the logbook API. |

doc/releaseNotes.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,3 +496,7 @@ This file describes the main feature changes for each readout.exe released versi
496496

497497
## v2.15 - 03/11/2022
498498
- equipment-*.rdhCheckFirstOrbit: when set, readout also check consistency of orbits between all the links of an equipment. If not all links/equipments first orbit are the same, readout will interrupt the run.
499+
500+
## next version
501+
- Updated configuration parameters:
502+
- added readout.fairmqConsoleSeverity, to set fair::Logger::SetConsoleSeverity

src/mainReadout.cxx

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -752,6 +752,17 @@ int Readout::configure(const boost::property_tree::ptree& properties)
752752
#endif
753753
}
754754

755+
#ifdef WITH_FAIRMQ
756+
// configuration parameter: | readout | fairmqConsoleSeverity | int | -1 | Select amount of FMQ messages with fair::Logger::SetConsoleSeverity(). Value as defined in Severity enum defined from FairLogger/Logger.h. Use -1 to leave current setting. |
757+
int cfgFairmqConsoleSeverity = -1;
758+
cfg.getOptionalValue<int>("readout.fairmqConsoleSeverity", cfgFairmqConsoleSeverity);
759+
if (cfgFairmqConsoleSeverity >= 0) {
760+
unsetFMQLogsToInfoLogger(); // default redirection was set already on readout startup, so unset it first.
761+
fair::Logger::SetConsoleSeverity((fair::Severity)cfgFairmqConsoleSeverity); // set console severity
762+
setFMQLogsToInfoLogger(&theLog); // redirect
763+
}
764+
#endif
765+
755766
// configuration of memory banks
756767
int numaNodeChanged = 0;
757768
for (auto kName : ConfigFileBrowser(&cfg, "bank-")) {

src/readoutConfigEditor.tcl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ set configurationParametersDescriptor {
139139
| readout | disableAggregatorSlicing | int | 0 | When set, the aggregator slicing is disabled, data pages are passed through without grouping/slicing. |
140140
| readout | disableTimeframes | int | 0 | When set, all timeframe related features are disabled (this may supersede other config parameters). |
141141
| readout | exitTimeout | double | -1 | Time in seconds after which the program exits automatically. -1 for unlimited. |
142+
| readout | fairmqConsoleSeverity | int | -1 | Select amount of FMQ messages with fair::Logger::SetConsoleSeverity(). Value as defined in Severity enum defined from FairLogger/Logger.h. Use -1 to leave current setting. |
142143
| readout | flushConsumerTimeout | double | 1 | Time in seconds to wait before stopping the consumers (ie wait allocated pages released). 0 means stop immediately. |
143144
| readout | flushEquipmentTimeout | double | 1 | Time in seconds to wait for data once the equipments are stopped. 0 means stop immediately. |
144145
| readout | logbookApiToken | string | | The token to be used for the logbook API. |

0 commit comments

Comments
 (0)