Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-10 11:58:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[common/logging] fix android stupid ctor() init order not initializing logging first (#3719)
Some checks are pending
tx-src / sources (push) Waiting to run
Details
Check Strings / check-strings (push) Waiting to run
Details

Browse source 
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3719
Reviewed-by: DraVee <chimera@dravee.dev>
Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie 2026-03-12 23:16:56 +01:00 • committed by crueter
parent 395613b01f
commit 4337135910
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/common/logging.cpp
View file

@ -410,39 +410,48 @@ struct Impl {
// Constructor shall NOT depend upon Settings() or whatever
// it's ran at global static ctor() time... so BE CAREFUL MFER!
static Common::Log::Impl logging_instance{};
static std::optional<Common::Log::Impl> logging_instance{};
void Initialize() {
logging_instance.filter.ParseFilterString(Settings::values.log_filter.GetValue());
if (logging_instance) {
LOG_WARNING(Log, "Reinitializing logging backend");
} else {
logging_instance.emplace();
logging_instance->filter.ParseFilterString(Settings::values.log_filter.GetValue());
#ifndef __OPENORBIS__
using namespace Common::FS;
const auto& log_dir = GetEdenPath(EdenPath::LogDir);
void(CreateDir(log_dir));
logging_instance.file_backend.emplace(log_dir / LOG_FILE);
using namespace Common::FS;
const auto& log_dir = GetEdenPath(EdenPath::LogDir);
void(CreateDir(log_dir));
logging_instance->file_backend.emplace(log_dir / LOG_FILE);
#endif
}
}
void Start() {
logging_instance.StartBackendThread();
if (logging_instance)
logging_instance->StartBackendThread();
}
void Stop() {
logging_instance.StopBackendThread();
if (logging_instance)
logging_instance->StopBackendThread();
}
void SetGlobalFilter(const Filter& filter) {
logging_instance.filter = filter;
if (logging_instance)
logging_instance->filter = filter;
}
void SetColorConsoleBackendEnabled(bool enabled) {
logging_instance.color_console_backend.enabled = enabled;
if (logging_instance)
logging_instance->color_console_backend.enabled = enabled;
}
void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, fmt::string_view format, const fmt::format_args& args) {
if (logging_instance.filter.CheckMessage(log_class, log_level)) {
logging_instance.message_queue.EmplaceWait(Entry{
if (logging_instance && logging_instance->filter.CheckMessage(log_class, log_level)) {
logging_instance->message_queue.EmplaceWait(Entry{
.message = fmt::vformat(format, args),
.timestamp = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now() - logging_instance.time_origin),
.timestamp = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now() - logging_instance->time_origin),
.log_class = log_class,
.log_level = log_level,
.filename = TrimSourcePath(filename),