Not sue InfoLogger for internal logging

Author: awegrzyn

src/Backends/ApMonBackend.cxx

@@ -18,8 +18,6 @@ namespace Monitoring
 namespace Backends
 {
 
-using AliceO2::InfoLogger::InfoLogger;
-
 ApMonBackend::ApMonBackend(const std::string& configurationFile)
 {
   try {

src/Backends/Flume.cxx

@@ -7,6 +7,7 @@
 #include <string>
 #include "../Transports/UDP.h"
 #include <boost/property_tree/json_parser.hpp>
+#include <boost/lexical_cast.hpp>
 
 namespace AliceO2
 {
@@ -17,8 +18,6 @@ namespace Monitoring
 namespace Backends
 {
 
-using AliceO2::InfoLogger::InfoLogger;
-
 Flume::Flume(const std::string &hostname, int port)
 {
   mTransport = std::make_unique<Transports::UDP>(hostname, port);

src/Backends/InfluxDB.cxx

@@ -4,6 +4,7 @@
 ///
 
 #include "InfluxDB.h"
+#include <boost/lexical_cast.hpp>
 #include <string>
 #include "../Transports/UDP.h"
 #include "../Transports/HTTP.h"
@@ -18,8 +19,6 @@ namespace Monitoring
 namespace Backends
 {
 
-using AliceO2::InfoLogger::InfoLogger;
-
 InfluxDB::InfluxDB(const std::string &hostname, int port)
 { 
   transport = std::make_unique<Transports::UDP>(hostname, port);

src/Collector.cxx

@@ -35,9 +35,8 @@ namespace Monitoring
 
 Collector::Collector(const std::string& configPath)
 {
-  MonLogger::Get() << AliceO2::InfoLogger::InfoLogger::Severity::Debug 
-                       << "Creating Monitoring instance from configuration: "
-                       << configPath << MonLogger::End();
+  MonLogger::Get() << "Creating Monitoring instance from configuration: "
+    << configPath << MonLogger::End();
 
   std::unique_ptr<Configuration::ConfigurationInterface> configFile =
 		  Configuration::ConfigurationFactory::getConfiguration(configPath);

src/DerivedMetrics.cxx

@@ -5,7 +5,7 @@
 
 #include "Monitoring/DerivedMetrics.h"
 #include "Exceptions/MonitoringInternalException.h"
-
+#include <boost/lexical_cast.hpp>
 #include <chrono>
 #include <iostream>
 #include <map>

src/Exceptions/MonitoringException.cxx

@@ -4,6 +4,7 @@
 ///
 
 #include "MonitoringException.h"
+#include <sstream>
 #include "../MonLogger.h"
 
 namespace AliceO2
@@ -20,7 +21,7 @@ MonitoringException::MonitoringException(int code, const std::string& source, co
   std::stringstream ss; 
   ss << "MonitoringException[" << source << "] (" << code << "): " << message;
   this->message = ss.str();
-  MonLogger::Get() << AliceO2::InfoLogger::InfoLogger::Severity::Error << message << MonLogger::End();
+  MonLogger::Get() << message << MonLogger::End();
 }
 
 const char* MonitoringException::what() const throw()

src/Exceptions/MonitoringInternalException.cxx

@@ -18,7 +18,7 @@ MonitoringInternalException::MonitoringInternalException(const std::string& sour
 MonitoringInternalException::MonitoringInternalException(int code, const std::string& source, const std::string& message)
 : message(message)
 {
-  MonLogger::Get() << AliceO2::InfoLogger::InfoLogger::Severity::Debug << "MonitoringInternalException["
+  MonLogger::Get() << "MonitoringInternalException["
                        << source << "] (" << code << "): " << message << MonLogger::End();
 }
 

src/MonLogger.h

@@ -1,48 +1,52 @@
 ///
 /// \file MonLogger.h
-/// \author Barthelemy von Haller
 /// \author Adam Wegrzynek <[email protected]>
 ///
 
 #ifndef MONITORING_MONINFOLOGGER_H
 #define MONITORING_MONINFOLOGGER_H
 
 #include <iostream>
-#include <InfoLogger/InfoLogger.hxx>
 
 namespace AliceO2
 {
 /// ALICE O2 Monitoring system
 namespace Monitoring
 {
 
-using namespace AliceO2::InfoLogger;
-
-/// Singleton class that is used in all Monitoring classes
-///
-/// The aim of this class is to avoid every class in the package to define and configure its own instance of InfoLogger.
-/// Independent InfoLogger instance can still be created when and if needed.
-class MonLogger : public AliceO2::InfoLogger::InfoLogger
+/// Simple Monitoring logging class
+class MonLogger
 {
   public:
+    template <typename T>
+    MonLogger &operator<<(const T &log) {
+        mStream << log;
+        return *this;
+    }
+
+    MonLogger &operator<<(std::ostream& (*log) (std::ostream&)) {
+        mStream << log;
+        return *this;
+    }
     static MonLogger &Get()
     {
-      static MonLogger infoLoggerInstance;
-      return infoLoggerInstance;
+      static MonLogger loggerInstance;
+      return loggerInstance;
     }
-    static auto End() -> decltype(AliceO2::InfoLogger::InfoLogger::endm)
+    static auto End() -> decltype("\n")
     {
-      return AliceO2::InfoLogger::InfoLogger::endm;
+      return "\n";
     }
 
   private:
-    MonLogger() = default;
+    std::ostream &mStream;
+    MonLogger(std::ostream &oStream = std::cout): mStream(oStream) {};
 
     /// Delete copy and move constructors
     MonLogger &operator=(const MonLogger &) = delete;
     MonLogger(const MonLogger &) = delete;
     MonLogger(MonLogger &&) = delete;
-    MonLogger &operator=(InfoLogger&&) = delete;
+    MonLogger &operator=(MonLogger&&) = delete;
 
 };
 

src/MonitoringFactory.cxx

@@ -14,8 +14,6 @@ namespace AliceO2
 namespace Monitoring 
 {
 
-using AliceO2::InfoLogger::InfoLogger;
-
 std::string MonitoringFactory::configPath = "";
 
 void MonitoringFactory::Configure(const std::string& configPath)
@@ -25,8 +23,8 @@ void MonitoringFactory::Configure(const std::string& configPath)
     Configuration::ConfigurationFactory::getConfiguration(configPath);
   }
   else {
-    MonLogger::Get() << InfoLogger::Severity::Warning << "Reconfiguration of Monitoring forebidden! Valid configuration path: "
-                         << MonitoringFactory::configPath  << MonLogger::End();
+    MonLogger::Get() << "Reconfiguration of Monitoring forebidden! Valid configuration path: "
+      << MonitoringFactory::configPath  << MonLogger::End();
   }
 }
 

src/ProcessMonitor.cxx

@@ -9,6 +9,7 @@
 #include <boost/algorithm/string/split.hpp>
 #include <chrono>
 #include "MonLogger.h"
+#include <sstream>
 
 namespace AliceO2
 {