Fixed build script for rlm_stg.

[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 9fe1487842188e29699d3e0deaab8c01e7730b17..115d1fb3907a71e63e2c798cf3f1d18d3cd60a08 100644 (file)
--- a/stglibs/logger.lib/include/stg/logger.h
+++ b/stglibs/logger.lib/include/stg/logger.h
@@ -5,16 +5,14 @@
 
 #include <string>
 
 
 #include <string>
 

-const char * LogDate(time_t t);
-//-----------------------------------------------------------------------------

 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); };
+    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);


@@ -26,22 +24,40 @@ private:
 class STG_LOGGER
 {
 friend STG_LOGGER & GetStgLogger();
 class STG_LOGGER
 {
 friend STG_LOGGER & GetStgLogger();

+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
+{
+friend PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER & logger, const std::string & pluginName);
+
+public:
+    PLUGIN_LOGGER(const PLUGIN_LOGGER & rhs);
+    void operator()(const char * fmt, ...) const;
+    void operator()(const std::string & line) const;
+
+private:
+    PLUGIN_LOGGER(const STG_LOGGER & logger, const std::string & pn);
+    std::string pluginName;
+};
+
+PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER & logger, const std::string & pluginName);

 
 #endif //STG_LOGGER_H
 
 #endif //STG_LOGGER_H