diff --git a/src/cppcommon/logger.cpp b/src/cppcommon/logger.cpp index 8a8fdf6..90c44d6 100644 --- a/src/cppcommon/logger.cpp +++ b/src/cppcommon/logger.cpp @@ -5,16 +5,16 @@ #include "logger.h" namespace CPPCOMMON { - const char * Logger::_logFormat = "%s [File:%s] [Line:%d] [%s] Msg:%s\n"; + char Logger::_cStrBuf[CSTR_BUFFER_SIZE]; + const char * Logger::_logLevel[LEVEL_ARRAY_SIZE] = { + "DEBUG","INFO","WARN","ERROR","FATAL" + }; + + const char * Logger::_logFormat = "%s [File:%s] [Line:%d] [%s] Msg:%s\n"; const char * Logger::_timeFormat = "%Y-%m-%d %H:%M:%S"; + time_t Logger::_timeNow; Logger::Logger() { - _logLevel[LL_DEBUG] = "DEBUG"; - _logLevel[LL_INFO] = "INFO"; - _logLevel[LL_WARN] = "WARN"; - _logLevel[LL_ERROR] = "ERROR"; - _logLevel[LL_FATAL] = "FATAL"; - } Logger::~Logger() @@ -52,10 +52,6 @@ namespace CPPCOMMON return true; } } -namespace CPPCOMMON -{ - Logger loggerSingleTon; -} #ifdef LOGGER_UT diff --git a/src/cppcommon/logger.h b/src/cppcommon/logger.h index b55819c..f868fdd 100644 --- a/src/cppcommon/logger.h +++ b/src/cppcommon/logger.h @@ -23,11 +23,11 @@ #define CSTR_BUFFER_SIZE 1024 -#define LogDebug(msg) loggerSingleTon.Logging(LL_DEBUG, msg, __FILE__, __LINE__) -#define LogInfo(msg) loggerSingleTon.Logging(LL_INFO, msg, __FILE__, __LINE__) -#define LogWarn(msg) loggerSingleTon.Logging(LL_WARN, msg, __FILE__, __LINE__) -#define LogError(msg) loggerSingleTon.Logging(LL_ERROR, msg, __FILE__, __LINE__) -#define LogFatal(msg) loggerSingleTon.Logging(LL_FATAL, msg, __FILE__, __LINE__) +#define LogDebug(msg) Logger::Logging(LL_DEBUG, msg, __FILE__, __LINE__) +#define LogInfo(msg) Logger::Logging(LL_INFO, msg, __FILE__, __LINE__) +#define LogWarn(msg) Logger::Logging(LL_WARN, msg, __FILE__, __LINE__) +#define LogError(msg) Logger::Logging(LL_ERROR, msg, __FILE__, __LINE__) +#define LogFatal(msg) Logger::Logging(LL_FATAL, msg, __FILE__, __LINE__) @@ -40,20 +40,15 @@ namespace CPPCOMMON Logger(); ~Logger(); public: - bool Logging(uint level, const string& msg, const char* fileName, int lineNo); - bool Logging(uint level, const char * msg, const char* fileName, int lineNo); + static bool Logging(uint level, const string& msg, const char* fileName, int lineNo); + static bool Logging(uint level, const char * msg, const char* fileName, int lineNo); private: - char _cStrBuf[CSTR_BUFFER_SIZE]; - const char * _logLevel[LEVEL_ARRAY_SIZE]; + static char _cStrBuf[CSTR_BUFFER_SIZE]; + static const char * _logLevel[LEVEL_ARRAY_SIZE]; static const char * _logFormat; static const char * _timeFormat; - time_t _timeNow; + static time_t _timeNow; }; } -namespace CPPCOMMON -{ - extern Logger loggerSingleTon; -} - #endif