octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

logging: Fix log filter during initialization

Browse Source 
The log filter was being ignored on initialization due to the logging instance being initialized before the config instance, so the log filter was set to its default value.

This fixes that oversight, along with using descriptive exceptions instead of abort() calls.
This commit is contained in:
ameerj
2023-06-24 03:05:04 +03:00
committed by GPUCode
parent a8340395a3
commit 98e9f4c32e
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/logging/backend.cpp
View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include <chrono>
#include <exception>
#include <thread>
#include <vector>
#include "common/common_paths.h"
@ -177,7 +178,7 @@ public:
};
#endif
bool initialization_in_progress_suppress_logging = false;
bool initialization_in_progress_suppress_logging = true;
#ifdef CITRA_LINUX_GCC_BACKTRACE
[[noreturn]] void SleepForever() {
@ -194,14 +195,15 @@ class Impl {
public:
static Impl& Instance() {
if (!instance) {
abort();
throw std::runtime_error("Using Logging instance before its initialization");
}
return *instance;
}
static void Initialize() {
if (instance) {
abort();
LOG_WARNING(Log, "Reinitializing logging backend");
return;
}
initialization_in_progress_suppress_logging = true;
const auto& log_dir = FileUtil::GetUserPath(FileUtil::UserPath::LogDir);