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

Fix a logger init issue.

Browse Source
This commit is contained in:
Adam Gu
2018-07-05 17:12:13 +08:00
parent b85377c3a3
commit 1d64421e33
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/rest/book_client/main.cc
+1 -1
View File
@@ -173,7 +173,7 @@ int main(int argc, char* argv[]) {
return 1; return 1;
} }
WEBCC_LOG_INIT("", webcc::LOG_CONSOLE); WEBCC_LOG_INIT("", webcc::LOG_CONSOLE_FILE_OVERWRITE);
std::string host = argv[1]; std::string host = argv[1];
std::string port = argv[2]; std::string port = argv[2];
src/webcc/logger.cc
+22 -22
View File
@@ -6,7 +6,6 @@
#include <chrono> #include <chrono>
#include <cstdarg> #include <cstdarg>
#include <ctime> #include <ctime>
#include <memory>
#include <mutex> #include <mutex>
#include <sstream> #include <sstream>
#include <string> #include <string>
@@ -17,7 +16,12 @@
namespace webcc { namespace webcc {
struct Logger { struct Logger {
Logger(const std::string& path, int modes) : file(nullptr), modes(modes) { Logger() : file(nullptr), modes(0) {
}
void Init(const std::string& path, int _modes) {
modes = _modes;
if (!path.empty()) { if (!path.empty()) {
if ((modes & LOG_OVERWRITE) != 0) { if ((modes & LOG_OVERWRITE) != 0) {
file = fopen(path.c_str(), "w+"); file = fopen(path.c_str(), "w+");
@@ -40,7 +44,7 @@ struct Logger {
}; };
// Global logger. // Global logger.
static std::shared_ptr<Logger> g_logger; static Logger g_logger;
static std::thread::id g_main_thread_id; static std::thread::id g_main_thread_id;
@@ -69,7 +73,7 @@ static bfs::path InitLogPath(const std::string& dir) {
void LogInit(const std::string& dir, int modes) { void LogInit(const std::string& dir, int modes) {
bfs::path path = InitLogPath(dir); bfs::path path = InitLogPath(dir);
g_logger.reset(new Logger(path.string(), modes)); g_logger.Init(path.string(), modes);
// Suppose LogInit() is called from the main thread. // Suppose LogInit() is called from the main thread.
g_main_thread_id = std::this_thread::get_id(); g_main_thread_id = std::this_thread::get_id();
@@ -115,45 +119,41 @@ static std::string GetThreadID() {
void LogWrite(int level, const char* file, int line, const char* format, ...) { void LogWrite(int level, const char* file, int line, const char* format, ...) {
assert(format != nullptr); assert(format != nullptr);
va_list va_ptr_file; va_list args;
va_list va_ptr_console; va_start(args, format);
va_start(va_ptr_file, format); if ((g_logger.modes & LOG_FILE) != 0 && g_logger.file != nullptr) {
va_start(va_ptr_console, format); std::lock_guard<std::mutex> lock(g_logger.mutex);
if ((g_logger->modes & LOG_FILE) != 0 && g_logger->file != nullptr) { fprintf(g_logger.file, "%s, %s, %5s, %24s, %4d, ",
std::lock_guard<std::mutex> lock(g_logger->mutex);
fprintf(g_logger->file, "%s, %s, %5s, %24s, %4d, ",
GetTimestamp().c_str(), kLevelNames[level], GetThreadID().c_str(), GetTimestamp().c_str(), kLevelNames[level], GetThreadID().c_str(),
file, line); file, line);
vfprintf(g_logger->file, format, va_ptr_console); vfprintf(g_logger.file, format, args);
fprintf(g_logger->file, "\n"); fprintf(g_logger.file, "\n");
if ((g_logger->modes & LOG_FLUSH) != 0) { if ((g_logger.modes & LOG_FLUSH) != 0) {
fflush(g_logger->file); fflush(g_logger.file);
} }
} }
if ((g_logger->modes & LOG_CONSOLE) != 0) { if ((g_logger.modes & LOG_CONSOLE) != 0) {
std::lock_guard<std::mutex> lock(g_logger->mutex); std::lock_guard<std::mutex> lock(g_logger.mutex);
fprintf(stderr, "%s, %s, %5s, %24s, %4d, ", fprintf(stderr, "%s, %s, %5s, %24s, %4d, ",
GetTimestamp().c_str(), kLevelNames[level], GetThreadID().c_str(), GetTimestamp().c_str(), kLevelNames[level], GetThreadID().c_str(),
file, line); file, line);
vfprintf(stderr, format, va_ptr_console); vfprintf(stderr, format, args);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
if ((g_logger->modes & LOG_FLUSH) != 0) { if ((g_logger.modes & LOG_FLUSH) != 0) {
fflush(stderr); fflush(stderr);
} }
} }
va_end(va_ptr_file); va_end(args);
va_end(va_ptr_console);
} }
} // namespace webcc } // namespace webcc