generic-library/g3log
1
0
Fork 0
mirror of https://github.com/KjellKod/g3log.git synced 2025-03-01 10:57:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94 from KjellKod/Fatal_exit_For_Erronous_Initialization

Browse Source 
Avoid initialization/shutdown deadlock
This commit is contained in:
Kjell Hedström 2016-05-23 22:34:41 -06:00
commit e58cc942dd
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/g3log.cpp
View File

@ -31,7 +31,8 @@
#include <iostream>
#include <thread>
#include <atomic>
#include <cstdlib>
#include <sstream>
namespace {
std::once_flag g_initialize_flag;
@ -63,8 +64,15 @@ namespace g3 {
installCrashHandler();
});
std::lock_guard<std::mutex> lock(g_logging_init_mutex);
CHECK(!internal::isLoggingInitialized());
CHECK(bgworker != nullptr);
if (internal::isLoggingInitialized() || nullptr == bgworker) {
std::ostringstream exitMsg;
exitMsg << __FILE__ "->" << __FUNCTION__ << ":" << __LINE__ << std::endl;
exitMsg << "\tFatal exit due to illegal initialization of g3::LogWorker\n";
exitMsg << "\t(due to multiple initializations? : " << std::boolalpha << internal::isLoggingInitialized();
exitMsg << ", due to nullptr == bgworker? : " << std::boolalpha << (nullptr == bgworker) << ")";
std::cerr << exitMsg.str() << std::endl;
std::exit(EXIT_FAILURE);
}
// Save the first uninitialized message, if any
std::call_once(g_save_first_unintialized_flag, [&bgworker] {