UnknownObject/WebCC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a segment fault of logger.

Browse Source
This commit is contained in:
Chunting Gu
2018-08-23 09:46:09 +08:00
parent 8faa45defe
commit 2e2b45dd43
2 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webcc/logger.cc
+37 -22
View File
@@ -121,40 +121,55 @@ static std::string GetThreadID() {
return ss.str();
}
static void WriteToFile(FILE* fd, int level, const char* file, int line,
const char* format, va_list args) {
std::lock_guard<std::mutex> lock(g_logger.mutex);
fprintf(fd, "%s, %s, %7s, %24s, %4d, ",
GetTimestamp().c_str(), kLevelNames[level], GetThreadID().c_str(),
file, line);
vfprintf(fd, format, args);
fprintf(fd, "\n");
if ((g_logger.modes & LOG_FLUSH) != 0) {
fflush(fd);
}
}
void LogWrite(int level, const char* file, int line, const char* format, ...) {
assert(format != nullptr);
std::string timestamp = GetTimestamp();
std::string thread_id = GetThreadID();
if ((g_logger.modes & LOG_FILE) != 0 && g_logger.file != nullptr) {
std::lock_guard<std::mutex> lock(g_logger.mutex);
va_list args;
va_start(args, format);
if ((g_logger.modes & LOG_FILE) != 0 && g_logger.file != nullptr) {
WriteToFile(g_logger.file, level, file, line, format, args);
}
fprintf(g_logger.file, "%s, %s, %7s, %24s, %4d, ",
timestamp.c_str(), kLevelNames[level], thread_id.c_str(),
file, line);
if ((g_logger.modes & LOG_CONSOLE) != 0) {
WriteToFile(stderr, level, file, line, format, args);
vfprintf(g_logger.file, format, args);
fprintf(g_logger.file, "\n");
if ((g_logger.modes & LOG_FLUSH) != 0) {
fflush(g_logger.file);
}
va_end(args);
}
if ((g_logger.modes & LOG_CONSOLE) != 0) {
std::lock_guard<std::mutex> lock(g_logger.mutex);
va_list args;
va_start(args, format);
fprintf(stderr, "%s, %s, %7s, %24s, %4d, ",
timestamp.c_str(), kLevelNames[level], thread_id.c_str(),
file, line);
vfprintf(stderr, format, args);
fprintf(stderr, "\n");
if ((g_logger.modes & LOG_FLUSH) != 0) {
fflush(stderr);
}
va_end(args);
}
}
} // namespace webcc
#endif // WEBCC_ENABLE_LOG