Ticket 37. The 'change_policy_timeout' field added for UPDATE tariffs SET

[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 c55801ac2a32570fb41348b2f74a2d604332122b..e8d625a0f105b1f137c9a64514431e8f7b758c2f 100644 (file)
--- a/stglibs/logger.lib/include/stg/logger.h
+++ b/stglibs/logger.lib/include/stg/logger.h
@@ -30,6 +30,7 @@ public:
     ~STG_LOGGER();
     void SetLogFileName(const std::string & fn);
     void operator()(const char * fmt, ...) const;
     ~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()); }

 
 private:
     STG_LOGGER();
 
 private:
     STG_LOGGER();


@@ -37,22 +38,25 @@ private:
     STG_LOGGER & operator=(const STG_LOGGER & rvalue);
 
     const char * LogDate(time_t t) const;
     STG_LOGGER & operator=(const STG_LOGGER & rvalue);
 
     const char * LogDate(time_t t) const;

+    void LogString(const char * str) const;

 
     std::string fileName;
     mutable pthread_mutex_t mutex;
 };
 //-----------------------------------------------------------------------------
 
     std::string fileName;
     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, ...) const;
+    PLUGIN_LOGGER(const PLUGIN_LOGGER& rhs) : m_parent(rhs.m_parent), m_pluginName(rhs.m_pluginName) {}
+    void operator()(const char* fmt, ...) const;
+    void operator()(const std::string& line) const;

 
 private:
     PLUGIN_LOGGER(const STG_LOGGER & logger, const std::string & pn);
 
 private:
     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);