Improve MonLogger severities and integration with InfoLogger (#265)

Author: awegrzyn

CMakeLists.txt

@@ -31,7 +31,7 @@ endif()
 
 # Define project
 project(Monitoring
-  VERSION 3.8.9
+  VERSION 3.8.10
   DESCRIPTION "O2 Monitoring library"
   LANGUAGES CXX
 )

src/MonLogger.h

@@ -33,10 +33,19 @@ namespace monitoring
 {
 
 /// List of possible log severities
+#ifdef O2_MONITORING_WITH_INFOLOGGER
+enum class Severity { Error = InfoLogger::Severity::Error,
+                      Warn = InfoLogger::Severity::Warning,
+                      Info = InfoLogger::Severity::Info,
+                      Silent = InfoLogger::Severity::Debug};
+
+#else
 enum class Severity { Error = 31,
                       Warn = 33,
                       Info = 49,
-                      Debug = 50};
+                      Silent = 50};
+#endif
+
 
 /// Simple Monitoring logging class
 class MonLogger
@@ -48,7 +57,7 @@ class MonLogger
   template <typename T>
   MonLogger& operator<<(const T& log)
   {
-    if (MonLogger::LogSeverity >= severity) {
+    if (!mMute) {
       mStream << log;
     }
     return *this;
@@ -58,11 +67,10 @@ class MonLogger
   /// Returns Logger instance with current date and given severity
   /// \param severity - severity level
   /// \return - logger instance
-  static MonLogger& Get(Severity desiredSeverity = Severity::Debug)
+  static MonLogger& Get(Severity severity = Severity::Silent)
   {
     static MonLogger loggerInstance;
-    loggerInstance.setSeverity(desiredSeverity);
-    loggerInstance.logHeader();
+    loggerInstance.logHeader(severity);
     return loggerInstance;
   }
 
@@ -74,27 +82,31 @@ class MonLogger
   static auto End() -> decltype("\033[0m\n") { return "\033[0m\n"; }
 #endif
 
-  /// Currently set severity
-  const Severity LogSeverity = Severity::Info;
-
  private:
-  /// Instance severity
-  Severity severity;
-
-  /// Log stream
+  /// Makes sure Silent messages are muted
+  bool mMute = false;
 #ifdef O2_MONITORING_WITH_INFOLOGGER
+  /// InfoLogger log output stream
   InfoLogger mStream;
-  void logHeader()
+  void logHeader(Severity severity)
   {
     InfoLoggerContext context;
     context.setField(InfoLoggerContext::FieldName::System, "Monitoring");
     context.setField(InfoLoggerContext::FieldName::Facility, "Library");
     mStream.setContext(context);
+    static InfoLogger::AutoMuteToken wToken({InfoLogger::Severity::Warning, InfoLogger::Level::Support, -1, nullptr, -1}, 2, 30);
+    switch(severity) {
+      case Severity::Silent:  mMute = true; break;
+      case Severity::Warn: mStream << &wToken; break;
+      default: mStream << static_cast<InfoLogger::Severity>(severity); break;
+    }
   }
 #else
+  /// Ostream log output stream
   std::ostream& mStream = std::cout;
-  void logHeader()
+  void logHeader(Severity severity)
   {
+    if (severity == Severity::Silent) { mMute = true; }
     *this << "\033[0;" << static_cast<int>(severity) << "m";
     auto now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
     *this << std::put_time(std::localtime(&now), "%Y-%m-%d %X") << "\t" << "Monitoring" << "\t";
@@ -104,12 +116,6 @@ class MonLogger
   /// Sets cout as a log stream
   MonLogger() = default;
 
-  /// Stream severity setter
-  void setSeverity(Severity desiredSeverity)
-  {
-    severity = desiredSeverity;
-  }
-
   /// Delete copy and move constructors
   MonLogger& operator=(const MonLogger&) = delete;
   MonLogger(const MonLogger&) = delete;

src/Transports/HTTP.cxx

@@ -66,10 +66,10 @@ void HTTP::send(std::string&& post)
   response = curl_easy_perform(mCurl);
   curl_easy_getinfo(mCurl, CURLINFO_RESPONSE_CODE, &responseCode);
   if (response != CURLE_OK) {
-    MonLogger::Get(Severity::Error) << "HTTP Tranport " << curl_easy_strerror(response) << MonLogger::End();
+    MonLogger::Get(Severity::Warn) << "HTTP Tranport " << curl_easy_strerror(response) << MonLogger::End();
   }
   if (responseCode < 200 || responseCode > 206) {
-    MonLogger::Get(Severity::Error) << "HTTP Transport: Response code : " << std::to_string(responseCode) << MonLogger::End();
+    MonLogger::Get(Severity::Warn) << "HTTP Transport: Response code : " << std::to_string(responseCode) << MonLogger::End();
   }
 }
 

src/Transports/Kafka.cxx

@@ -40,7 +40,7 @@ Kafka::Kafka(const std::string& host, unsigned int port, const std::string& topi
 
   producer = RdKafka::Producer::create(conf, errstr);
   if (!producer) {
-    MonLogger::Get(Severity::Error) << "Coult not initialize Kafka transport" << MonLogger::End();
+    MonLogger::Get(Severity::Warn) << "Coult not initialize Kafka transport" << MonLogger::End();
   }
 
   MonLogger::Get(Severity::Info) << "Kafka transport initialized (" << host << ":" << port << "/" << mTopic << ")" << MonLogger::End();
@@ -64,7 +64,7 @@ void Kafka::send(std::string&& message)
     NULL,
     NULL);
   if (resp != RdKafka::ERR_NO_ERROR) {
-    MonLogger::Get() << "Kafka send failed: " << RdKafka::err2str(resp) << MonLogger::End();
+    MonLogger::Get(Severity::Warn) << "Kafka send failed: " << RdKafka::err2str(resp) << MonLogger::End();
   }
   producer->poll(0);
 }

src/Transports/Unix.cxx

@@ -31,7 +31,7 @@ namespace transports
 Unix::Unix(const std::string& socketPath) : mSocket(mIoService), mEndpoint(socketPath)
 {
   if (!std::filesystem::exists(socketPath)) {
-    MonLogger::Get(Severity::Error) << "Unix socket path is invalid: " << socketPath << MonLogger::End();
+    MonLogger::Get(Severity::Warn) << "Unix socket path is invalid: " << socketPath << MonLogger::End();
   } else {
     mSocket.open();
     MonLogger::Get(Severity::Info) << "Unix socket transport initialized (" << socketPath << ")" << MonLogger::End();
@@ -43,7 +43,7 @@ void Unix::send(std::string&& message)
   try {
     mSocket.send_to(boost::asio::buffer(message, message.size()), mEndpoint);
   } catch (const boost::system::system_error& e) {
-    MonLogger::Get() << "Unix socket / " << e.what() << MonLogger::End();
+    MonLogger::Get(Severity::Warn) << "Unix socket / " << e.what() << MonLogger::End();
   }
 }
 #endif // defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)