Merge pull request #75 from sy-c/master

v2.3.0

doc/releaseNotes.md

@@ -105,3 +105,6 @@ This file describes the main feature changes for each InfoLogger released versio
 - Added option for o2-infologger-log to collect logs from a named pipe (multiple clients possible). Pipe can be created and listened to continuously. e.g. `o2-infologger-log -f /tmp/log-pipe -c -l`.
 - API:
   - Added InfoLoggerContext light copy constructor, with fields overwrite. See example use in <../test/testInfoLogger.cxx>.
+
+## v2.3.0 - 15/10/2021
+- Added possibility to use an AutoMuteToken in the c++ stream operator.

include/InfoLogger/InfoLogger.hxx

@@ -346,6 +346,10 @@ class InfoLogger
   /// Specialized << version to set message options
   InfoLogger& operator<<(const InfoLogger::InfoLoggerMessageOption options);
 
+  /// Specialized << version to set AutoMuteToken (by reference)
+  /// NB: this overwrites InfoLoggerMessageOption / Severity if set.
+  InfoLogger& operator<<(InfoLogger::AutoMuteToken * const token);
+
   /// Log a message using the << operator, like for std::cout.
   /// All messages must be ended with the InfoLogger::StreamOps::endm tag.
   /// Severity/options can be set at any point in the stream (before endm). Severity set to Info by default.

src/InfoLogger.cxx

@@ -185,6 +185,7 @@ class InfoLogger::Impl
     numberOfMessages = 0;
     currentStreamMessage.clear();
     currentStreamOptions = undefinedMessageOption;
+    currentStreamToken = nullptr;
     client = nullptr;
 
     floodReset();
@@ -395,6 +396,7 @@ class InfoLogger::Impl
   int numberOfMessages;                         //< number of messages received by this object
   std::string currentStreamMessage;             //< temporary variable to store message when concatenating << operations, until "endm" is received
   InfoLoggerMessageOption currentStreamOptions; //< temporary variable to store message options when concatenating << operations, until "endm" is received
+  InfoLogger::AutoMuteToken *currentStreamToken;//< temporary variable to store AutoMuteToken when concatenating << operations, until "endm" is received
 
   InfoLoggerContext currentContext;
 
@@ -900,9 +902,14 @@ InfoLogger& InfoLogger::operator<<(InfoLogger::StreamOps op)
 
   // end of message: flush current buffer in a single message
   if (op == endm) {
-    log(mPimpl->currentStreamOptions, "%s", mPimpl->currentStreamMessage.c_str());
+    if (mPimpl->currentStreamToken != nullptr) {
+      log(*mPimpl->currentStreamToken, "%s", mPimpl->currentStreamMessage.c_str());
+    } else {
+      log(mPimpl->currentStreamOptions, "%s", mPimpl->currentStreamMessage.c_str());
+    }
     mPimpl->currentStreamMessage.clear();
     mPimpl->currentStreamOptions = undefinedMessageOption;
+    mPimpl->currentStreamToken = nullptr;
   }
   return *this;
 }
@@ -919,6 +926,12 @@ InfoLogger& InfoLogger::operator<<(const InfoLogger::InfoLoggerMessageOption opt
   return *this;
 }
 
+InfoLogger& InfoLogger::operator<<(InfoLogger::AutoMuteToken * const token)
+{
+  mPimpl->currentStreamToken = token;
+  return *this;
+}
+
 InfoLogger::Severity InfoLogger::getSeverityFromString(const char* txt)
 {
   // permissive implementation

test/testInfoLogger.cxx

@@ -88,6 +88,7 @@ int main()
   theLog.log("Will now test auto-mute: limit = %d msg / %d s", limitN, limitT);
   // define a static variable token, and pass it to all relevant log() calls
   static InfoLogger::AutoMuteToken msgLimit(LogInfoDevel_(1234), limitN, limitT);  
+  theLog << &msgLimit << "This is message loop 0 (c++ style)" << InfoLogger::endm;
   // a couple of loops to show behavior
   for (int j=0; j<2; j++) {
     const int nmsg = 20 * limitN;