X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/25c5bd4fe8c9fd7c4898e7dfbbdbf68dc172dcd7..0d3126b51031578f051af3f38ed73b8e4e6a18bf:/stglibs/logger.lib/include/stg/logger.h?ds=sidebyside diff --git a/stglibs/logger.lib/include/stg/logger.h b/stglibs/logger.lib/include/stg/logger.h index dc87178e..60514f4a 100644 --- a/stglibs/logger.lib/include/stg/logger.h +++ b/stglibs/logger.lib/include/stg/logger.h @@ -1,18 +1,18 @@ #ifndef STG_LOGGER_H #define STG_LOGGER_H -#include - #include +#include + 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); @@ -30,6 +30,7 @@ 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()); } private: STG_LOGGER(); @@ -37,22 +38,27 @@ private: 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; }; //----------------------------------------------------------------------------- -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: - 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) {} // 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); - std::string pluginName; + const STG_LOGGER& m_parent; + std::string m_pluginName; }; PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER & logger, const std::string & pluginName);