Merge pull request #235 from sy-c/master

v2.15.1

Author: sy-c

doc/README.md

@@ -267,7 +267,7 @@ When enabled, Readout will copy the datapages to connected clients (copy overhea
 The interactive EventDump client can be started with parameter `port=...` (use the same as readout consumer address parameter) and `pageSize=...` (maximum super page size configured for readout equipments). Example launch command:
 
 ```
-  o2-readout-eventDump port=ipc:///tmp/o2-readout-out
+  o2-readout-eventdump port=ipc:///tmp/o2-readout-out
 ```
 
 Once running, the program accepts the following interactive keyboard commands:

doc/configurationParameters.md

@@ -161,6 +161,7 @@ The parameters related to 3rd-party libraries are described here for convenience
 | readout | disableAggregatorSlicing | int | 0 | When set, the aggregator slicing is disabled, data pages are passed through without grouping/slicing. |
 | readout | disableTimeframes | int | 0 | When set, all timeframe related features are disabled (this may supersede other config parameters). |
 | readout | exitTimeout | double | -1 | Time in seconds after which the program exits automatically. -1 for unlimited. |
+| 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. |
 | readout | flushConsumerTimeout | double | 1 | Time in seconds to wait before stopping the consumers (ie wait allocated pages released). 0 means stop immediately. |
 | readout | flushEquipmentTimeout | double | 1 | Time in seconds to wait for data once the equipments are stopped. 0 means stop immediately. |
 | readout | logbookApiToken | string | | The token to be used for the logbook API. |

doc/releaseNotes.md

@@ -496,3 +496,8 @@ This file describes the main feature changes for each readout.exe released versi
 
 ## v2.15 - 03/11/2022
 - 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.
+
+## v2.15.1 - 16/11/2022
+- Updated configuration parameters:
+  - added readout.fairmqConsoleSeverity, to set fair::Logger::SetConsoleSeverity
+- Explicit log message when reporting error state, in case not reported by state machine

src/ReadoutVersion.h

@@ -9,5 +9,5 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#define READOUT_VERSION "2.15"
+#define READOUT_VERSION "2.15.1"
 

src/mainReadout.cxx

@@ -210,6 +210,7 @@ class Readout
   int latencyFd = -1; // file descriptor for the "deep sleep" disabled
 
   bool isError = 0;                   // flag set to 1 when error has been detected
+  bool logFirstError = 0;             // flag set to 1 after 1 error reported from iterateCheck/iterateRunning procedures
   std::vector<std::string> strErrors; // errors backlog
   std::mutex mutexErrors;             // mutex to guard access to error variables
 
@@ -752,6 +753,17 @@ int Readout::configure(const boost::property_tree::ptree& properties)
 #endif
   }
 
+  #ifdef WITH_FAIRMQ
+  // 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. |
+  int cfgFairmqConsoleSeverity = -1;
+  cfg.getOptionalValue<int>("readout.fairmqConsoleSeverity", cfgFairmqConsoleSeverity);
+  if (cfgFairmqConsoleSeverity >= 0) {
+     unsetFMQLogsToInfoLogger(); // default redirection was set already on readout startup, so unset it first.
+     fair::Logger::SetConsoleSeverity((fair::Severity)cfgFairmqConsoleSeverity); // set console severity
+     setFMQLogsToInfoLogger(&theLog); // redirect
+   }
+  #endif
+
   // configuration of memory banks
   int numaNodeChanged = 0;
   for (auto kName : ConfigFileBrowser(&cfg, "bank-")) {
@@ -1307,6 +1319,10 @@ int Readout::iterateCheck()
     }
   }
   if (isError) {
+    if (!logFirstError) {
+      theLog.log(LogErrorSupport_(3231), "Error reported to state machine");
+      logFirstError = 1;
+    }
     return -1;
   }
   if ((cfgMaxMsgError > 0) && (theLog.getMessageCount(InfoLogger::Severity::Error) >= (unsigned long) cfgMaxMsgError)) {
@@ -1332,6 +1348,10 @@ int Readout::iterateRunning()
     return 1;
   }
   if (isError) {
+    if (!logFirstError) {
+      theLog.log(LogErrorSupport_(3231), "Error reported to state machine");
+      logFirstError = 1;
+    }
     return -1;
   }
   // regular logbook stats update
@@ -1451,6 +1471,10 @@ int Readout::reset()
   gReadoutStats.counters.notify++;
   gReadoutStats.publishNow();
 
+  // reset error flags
+  isError = 0;
+  logFirstError = 0 ;
+
   // close consumers before closing readout equipments (owner of data blocks)
   theLog.log(LogInfoDevel, "Releasing primary consumers");
   for (unsigned int i = 0; i < dataConsumers.size(); i++) {

src/readoutConfigEditor.tcl

@@ -139,6 +139,7 @@ set configurationParametersDescriptor {
 | readout | disableAggregatorSlicing | int | 0 | When set, the aggregator slicing is disabled, data pages are passed through without grouping/slicing. |
 | readout | disableTimeframes | int | 0 | When set, all timeframe related features are disabled (this may supersede other config parameters). |
 | readout | exitTimeout | double | -1 | Time in seconds after which the program exits automatically. -1 for unlimited. |
+| 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. |
 | readout | flushConsumerTimeout | double | 1 | Time in seconds to wait before stopping the consumers (ie wait allocated pages released). 0 means stop immediately. |
 | readout | flushEquipmentTimeout | double | 1 | Time in seconds to wait for data once the equipments are stopped. 0 means stop immediately. |
 | readout | logbookApiToken | string | | The token to be used for the logbook API. |