[OMON-442] Use InfoLogger if available (#238)

Author: awegrzyn

CMakeLists.txt

@@ -17,7 +17,7 @@ endif()
 
 # Define project
 project(Monitoring
-  VERSION 3.7.1
+  VERSION 3.8.0
   DESCRIPTION "O2 Monitoring library"
   LANGUAGES CXX
 )
@@ -59,6 +59,7 @@ find_package(Git QUIET)
 find_package(ApMon MODULE)
 find_package(CURL MODULE)
 find_package(RdKafka CONFIG)
+find_package(InfoLogger CONFIG)
 
 ####################################
 # Set OUTPUT vars
@@ -137,6 +138,7 @@ target_link_libraries(Monitoring
     $<$<BOOL:${ApMon_FOUND}>:ApMon::ApMon>
     $<$<BOOL:${RdKafka_FOUND}>:RdKafka::rdkafka++>
     $<$<BOOL:${CURL_FOUND}>:CURL::libcurl>
+    $<$<BOOL:${InfoLogger_FOUND}>:AliceO2::InfoLogger>
 )
 
 # Handle ApMon optional dependency
@@ -170,6 +172,7 @@ target_compile_definitions(Monitoring
     $<$<BOOL:${ApMon_FOUND}>:O2_MONITORING_WITH_APPMON>
     $<$<BOOL:${RdKafka_FOUND}>:O2_MONITORING_WITH_KAFKA>
     $<$<BOOL:${CURL_FOUND}>:O2_MONITORING_WITH_CURL>
+    $<$<BOOL:${InfoLogger_FOUND}>:O2_MONITORING_WITH_INFOLOGGER>
   )
 
 # Use C++17

src/MonLogger.h

@@ -20,6 +20,11 @@
 #include <iomanip>
 #include <iostream>
 
+#ifdef O2_MONITORING_WITH_INFOLOGGER
+#include <InfoLogger/InfoLogger.hxx>
+using namespace AliceO2::InfoLogger;
+#endif
+
 namespace o2
 {
 /// ALICE O2 Monitoring system
@@ -52,20 +57,21 @@ class MonLogger
   /// Returns Logger instance with current date and given severity
   /// \param severity - severity level
   /// \return - logger instance
-  static MonLogger& Get(Severity severity = Severity::Debug)
+  static MonLogger& Get(Severity desiredSeverity = Severity::Debug)
   {
     static MonLogger loggerInstance;
-    loggerInstance.instanceSeverity(severity);
-    loggerInstance.setDate();
+    loggerInstance.setSeverity(desiredSeverity);
+    loggerInstance.logHeader();
     return loggerInstance;
   }
 
   /// Terminates log line
   /// return - string with color termination and new line
-  static auto End() -> decltype("\033[0m\n")
-  {
-    return "\033[0m\n";
-  }
+#ifdef O2_MONITORING_WITH_INFOLOGGER
+  static auto End() -> decltype(InfoLogger::endm) { return InfoLogger::endm; }
+#else
+  static auto End() -> decltype("\033[0m\n") { return "\033[0m\n"; }
+#endif
 
   /// Currently set severity
   const Severity LogSeverity = Severity::Info;
@@ -75,26 +81,32 @@ class MonLogger
   Severity severity;
 
   /// Log stream
-  std::ostream& mStream;
-
-  /// Sets cout as a log stream
-  MonLogger(std::ostream& oStream = std::cout) : mStream(oStream)
+#ifdef O2_MONITORING_WITH_INFOLOGGER
+  InfoLogger mStream;
+  void logHeader()
   {
+    InfoLoggerContext context;
+    context.setField(InfoLoggerContext::FieldName::System, "Monitoring");
+    context.setField(InfoLoggerContext::FieldName::Facility, "Library");
+    mStream.setContext(context);
   }
-
-  /// Appends current datetime to log stream
-  void setDate()
+#else
+  std::ostream& mStream = std::cout;
+  void logHeader()
   {
+    *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";
   }
+#endif
 
-  /// Sets log color based on severity
-  /// \param severity - log severity
-  void instanceSeverity(Severity desiredSeverity)
+  /// Sets cout as a log stream
+  MonLogger() = default;
+
+  /// Stream severity setter
+  void setSeverity(Severity desiredSeverity)
   {
     severity = desiredSeverity;
-    *this << "\033[0;" << static_cast<int>(severity) << "m";
   }
 
   /// Delete copy and move constructors