Merge pull request #2 from bobr-kun/MySQL_custom_port

[stg.git] / stglibs / logger.lib / include / stg / logger.h

diff --git a/stglibs/logger.lib/include/stg/logger.h b/stglibs/logger.lib/include/stg/logger.h
index 2c9c93fc2951fc77ba75e3c9203587ad0c6b44e8..60514f4a9d311de3d7f6f971df5cff24b31921da 100644 (file)
--- a/stglibs/logger.lib/include/stg/logger.h
+++ b/stglibs/logger.lib/include/stg/logger.h
@@ -1,20 +1,18 @@
 #ifndef STG_LOGGER_H
 #define STG_LOGGER_H
 
 #ifndef STG_LOGGER_H
 #define STG_LOGGER_H
 

-#include <pthread.h>
-

 #include <string>
 
 #include <string>
 

-const char * LogDate(time_t t);
-//-----------------------------------------------------------------------------
+#include <pthread.h>
+

 class STG_LOGGER;
 STG_LOGGER & GetStgLogger();
 //-----------------------------------------------------------------------------
 class STG_LOGGER_LOCKER
 {
 public:
 class STG_LOGGER;
 STG_LOGGER & GetStgLogger();
 //-----------------------------------------------------------------------------
 class STG_LOGGER_LOCKER
 {
 public:

-    STG_LOGGER_LOCKER(pthread_mutex_t * m) : mutex(m) { pthread_mutex_lock(mutex); };
-    ~STG_LOGGER_LOCKER() { pthread_mutex_unlock(mutex); };
+    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);
 
 private:
     STG_LOGGER_LOCKER(const STG_LOGGER_LOCKER & rvalue);


@@ -31,30 +29,36 @@ friend class PLUGIN_LOGGER;
 public:
     ~STG_LOGGER();
     void SetLogFileName(const std::string & fn);
 public:
     ~STG_LOGGER();
     void SetLogFileName(const std::string & fn);

-    void operator()(const char * fmt, ...);
+    void operator()(const char * fmt, ...) const;
+    void operator()(const std::string & line) const { LogString(line.c_str()); }

 
 private:
     STG_LOGGER();
     STG_LOGGER(const STG_LOGGER & rvalue);
     STG_LOGGER & operator=(const STG_LOGGER & rvalue);
 
 
 private:
     STG_LOGGER();
     STG_LOGGER(const STG_LOGGER & rvalue);
     STG_LOGGER & operator=(const STG_LOGGER & rvalue);
 

-    const char * LogDate(time_t t);
+    const char * LogDate(time_t t) const;
+    void LogString(const char * str) const;

 
     std::string fileName;
 
     std::string fileName;

-    pthread_mutex_t mutex;
+    mutable pthread_mutex_t mutex;

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

-class PLUGIN_LOGGER : private STG_LOGGER
+class PLUGIN_LOGGER

 {
 {

-friend PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER & logger, const std::string & pluginName);
+friend PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER& logger, const std::string& pluginName);

 
 public:
 
 public:

-    PLUGIN_LOGGER(const PLUGIN_LOGGER & rhs);
-    void operator()(const char * fmt, ...);
+    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:
 
 private:

+    PLUGIN_LOGGER& operator=(const PLUGIN_LOGGER&); // Copy assignment is prohibited.
+

     PLUGIN_LOGGER(const STG_LOGGER & logger, const std::string & pn);
     PLUGIN_LOGGER(const STG_LOGGER & logger, const std::string & pn);

-    std::string pluginName;
+    const STG_LOGGER& m_parent;
+    std::string m_pluginName;

 };
 
 PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER & logger, const std::string & pluginName);
 };
 
 PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER & logger, const std::string & pluginName);