Check if we can use C++17 with XMLRPC-C.

[stg.git] / libs / logger / include / stg / logger.h

diff --git a/libs/logger/include/stg/logger.h b/libs/logger/include/stg/logger.h
index 60514f4a9d311de3d7f6f971df5cff24b31921da..16e5b7aeeacdc925eabf5edebbb3391cde558729 100644 (file)
--- a/libs/logger/include/stg/logger.h
+++ b/libs/logger/include/stg/logger.h
@@ -1,66 +1,59 @@
-#ifndef STG_LOGGER_H
-#define STG_LOGGER_H
+#pragma once

 
 #include <string>
 
 #include <string>

+#include <mutex>

 
 

-#include <pthread.h>
-
-class STG_LOGGER;
-STG_LOGGER & GetStgLogger();
-//-----------------------------------------------------------------------------
-class STG_LOGGER_LOCKER
+namespace STG

 {
 {

-public:
-    explicit STG_LOGGER_LOCKER(pthread_mutex_t * m) : mutex(m) { pthread_mutex_lock(mutex); }
-    ~STG_LOGGER_LOCKER() { pthread_mutex_unlock(mutex); }
-
-private:
-    STG_LOGGER_LOCKER(const STG_LOGGER_LOCKER & rvalue);
-    STG_LOGGER_LOCKER & operator=(const STG_LOGGER_LOCKER & rvalue);

 
 

-    pthread_mutex_t * mutex;
-};
-//-----------------------------------------------------------------------------
-class STG_LOGGER
+class Logger

 {
 {

-friend STG_LOGGER & GetStgLogger();
-friend class PLUGIN_LOGGER;
+    public:
+        void setFileName(const std::string& fn);
+        void operator()(const char * fmt, ...) const;
+        void operator()(const std::string & line) const { logString(line.c_str()); }

 
 

-public:
-    ~STG_LOGGER();
-    void SetLogFileName(const std::string & fn);
-    void operator()(const char * fmt, ...) const;
-    void operator()(const std::string & line) const { LogString(line.c_str()); }
+        static Logger& get();

 
 

-private:
-    STG_LOGGER();
-    STG_LOGGER(const STG_LOGGER & rvalue);
-    STG_LOGGER & operator=(const STG_LOGGER & rvalue);
+    private:
+        const char* logDate(time_t t) const;
+        void logString(const char* str) const;

 
 

-    const char * LogDate(time_t t) const;
-    void LogString(const char * str) const;
-
-    std::string fileName;
-    mutable pthread_mutex_t mutex;
+        mutable std::mutex mutex;
+        std::string fileName;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class PLUGIN_LOGGER
+class PluginLogger

 {
 {

-friend PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER& logger, const std::string& pluginName);
-
-public:
-    PLUGIN_LOGGER(const PLUGIN_LOGGER& rhs) : m_parent(rhs.m_parent), m_pluginName(rhs.m_pluginName) {} // Need move here.
-    void operator()(const char* fmt, ...) const;
-    void operator()(const std::string& line) const;
-
-private:
-    PLUGIN_LOGGER& operator=(const PLUGIN_LOGGER&); // Copy assignment is prohibited.
-
-    PLUGIN_LOGGER(const STG_LOGGER & logger, const std::string & pn);
-    const STG_LOGGER& m_parent;
-    std::string m_pluginName;
+    public:
+        static PluginLogger get(std::string pluginName)
+        {
+            return PluginLogger(std::move(pluginName));
+        }
+
+        PluginLogger(PluginLogger&& rhs)
+            : m_parent(Logger::get()),
+              m_pluginName(std::move(rhs.m_pluginName))
+        {}
+        PluginLogger& operator=(PluginLogger&& rhs)
+        {
+            std::lock_guard<std::mutex> lock(m_mutex);
+            m_pluginName = std::move(rhs.m_pluginName);
+            return *this;
+        }
+
+        void operator()(const char* fmt, ...) const;
+        void operator()(const std::string& line) const;
+
+    private:
+        explicit PluginLogger(std::string pn)
+            : m_parent(Logger::get()),
+              m_pluginName(std::move(pn))
+        {}
+
+        mutable std::mutex m_mutex;
+        Logger& m_parent;
+        std::string m_pluginName;

 };
 
 };
 

-PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER & logger, const std::string & pluginName);
-
-#endif //STG_LOGGER_H
+}