From 395613b01f918b559f0a3b1718c78f81987c49d4 Mon Sep 17 00:00:00 2001 From: lizzie Date: Thu, 12 Mar 2026 18:29:15 +0100 Subject: [common/logging] Simplify logging logic and fix issues when logging before system is created (#3688) - our logging code was bigger than spdlog itself, why???? just keep it simple - fix issues when logging before logging system is even started - removes the "initialized logging twice" issue - removes uneeded indirection in file logging - uses direct formatting instead of jumping hoopla-around the fmt::format() ressult - code duplication and dead code removal as usual I did explore dup2() but I think it's not worth the hassle I did try `fwopen()` but it's better if things are just kept as-is. there is a lot of noise because I removed a bunch of redundant files on logging and just put everything in one file now normally this wouldn't be a good idea, however consider: the complexity of logging; it's less than 500 lines... does it really need a whole subsystem?!?!?! ITS JUST LOGGING Signed-off-by: lizzie Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3688 Reviewed-by: crueter Reviewed-by: DraVee Reviewed-by: CamilleLaVey Co-authored-by: lizzie Co-committed-by: lizzie --- src/network/network.cpp | 4 ++-- src/network/room.cpp | 2 +- src/network/verify_user.h | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/network') diff --git a/src/network/network.cpp b/src/network/network.cpp index 7d04c2241e..4946fcf3dd 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -1,10 +1,10 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "enet/enet.h" #include "network/network.h" diff --git a/src/network/room.cpp b/src/network/room.cpp index cf33763da2..7c257d2bd4 100644 --- a/src/network/room.cpp +++ b/src/network/room.cpp @@ -13,7 +13,7 @@ #include #include #include "common/polyfill_thread.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "enet/enet.h" #include "network/packet.h" #include "network/room.h" diff --git a/src/network/verify_user.h b/src/network/verify_user.h index 6fc64d8a3e..36aef5a817 100644 --- a/src/network/verify_user.h +++ b/src/network/verify_user.h @@ -1,10 +1,13 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2018 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include -#include "common/logging/log.h" +#include "common/logging.h" namespace Network::VerifyUser { -- cgit v1.2.3