diff --git a/src/cppcommon/Makefile b/src/cppcommon/Makefile index 0efc89e..422f612 100644 --- a/src/cppcommon/Makefile +++ b/src/cppcommon/Makefile @@ -28,14 +28,14 @@ file_functs.ut: file_functs.cpp file_functs.h io_functs.test: io_functs.cpp io_functs.h g++ -o $@ $< -DTEST_IO_FUNCTS str_functs.ut: str_functs.cpp str_functs.h - g++ -o $@ $< -DTEST_STR_FUNCTS -liconv + g++ -o $@ $< -DTEST_STR_FUNCTS encoding.ut: encoding.cpp str_functs.cpp str_functs.h encoding.h - g++ -o $@ encoding.cpp str_functs.cpp -DENCODING_UT -liconv + g++ -o $@ encoding.cpp str_functs.cpp -DENCODING_UT vec_functs.test: vec_functs.cpp vec_functs.h vec_functs.tcc g++ -o $@ $< -DTEST_VEC_FUNCTS logger.ut: logger.cpp logger.h file_functs.cpp file_functs.h str_functs.cpp str_functs.h - g++ -o $@ $< file_functs.cpp str_functs.cpp -DLOGGER_UT -liconv + g++ -o $@ $< file_functs.cpp str_functs.cpp -DLOGGER_UT config.ut: config.cpp config.h g++ -o $@ $< -DCONFIG_UT $(CMLIB) diff --git a/src/cppcommon/logger.cpp b/src/cppcommon/logger.cpp index 9467800..4b1afa7 100644 --- a/src/cppcommon/logger.cpp +++ b/src/cppcommon/logger.cpp @@ -5,7 +5,7 @@ #include "logger.h" namespace CPPCOMMON { - const char * Logger::_logFormat = "%s [File:%s] [Line:%d] [%s] Msg:%s"; + const char * Logger::_logFormat = "%s [File:%s] [Line:%d] [%s] Msg:%s\n"; const char * Logger::_timeFormat = "%Y-%m-%d %H:%M:%S"; Logger::Logger() { @@ -21,7 +21,7 @@ namespace CPPCOMMON { } - bool Logger::Logging(uint level, const string& msg, const char* fileName, int lineNo) + bool Logger::Logging(uint level, const char * msg, const char* fileName, int lineNo) { if(level > LL_FATAL) { @@ -32,16 +32,17 @@ namespace CPPCOMMON size_t ret = strftime(_cStrBuf, sizeof(_cStrBuf), _timeFormat, localtime(&_timeNow)); if(0 == ret) { - cerr<<"strftime failed."<= LL_WARN) { - cerr<