refactor: add config to switch crashlogger

LiteLDev · Feb 12, 2024 · 26e0a52 · 26e0a52
1 parent f5cf22b
commit 26e0a52
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/src/ll/core/Config.h b/src/ll/core/Config.h
@@ -15,7 +15,7 @@ namespace ll {
 
 struct LeviConfig {
 
-    int version = 13;
+    int version = 14;
 
     std::string language = "system";
     struct {
@@ -26,6 +26,7 @@ struct LeviConfig {
     struct {
         struct {
             bool        enabled    = true;
+            bool        builtin    = false;
             std::string logPath    = R"(.\logs\crash)";
             std::string dumpPrefix = "minidump_";
             std::string logPrefix  = "trace_";

diff --git a/src/ll/core/CrashLogger.h b/src/ll/core/CrashLogger.h
@@ -2,12 +2,6 @@
 
 #include "vcruntime.h"
 
-#if _HAS_CXX23
-#define LL_BUILTIN_CRASHLOGGER 0
-#else
-#define LL_BUILTIN_CRASHLOGGER 0
-#endif
-
 namespace ll {
 class CrashLogger {
 public:

diff --git a/src/ll/core/LeviLamina.cpp b/src/ll/core/LeviLamina.cpp
@@ -202,14 +202,6 @@ namespace i18n {
 extern std::string globalDefaultLocaleName;
 }
 
-void startCrashLogger() {
-#if !LL_BUILTIN_CRASHLOGGER
-    CrashLogger::initCrashLogger();
-#else
-    static CrashLoggerNew crashLogger{};
-#endif
-}
-
 void leviLaminaMain() {
     error_utils::setSehTranslator();
 
@@ -244,7 +236,11 @@ void leviLaminaMain() {
         ll::service::PlayerInfo::getInstance();
     }
     if (globalConfig.modules.crashLogger.enabled) {
-        startCrashLogger();
+        if (globalConfig.modules.crashLogger.builtin) {
+            static CrashLoggerNew crashLogger{};
+        } else {
+            CrashLogger::initCrashLogger();
+        }
     }
 
     // Register Exit Event Handler.
@@ -300,5 +296,3 @@ LL_AUTO_STATIC_HOOK(LeviLaminaMainHook, HookPriority::High, "main", int, int arg
     return res;
 }
 } // namespace ll
-
-[[maybe_unused]] BOOL WINAPI DllMain(HMODULE, DWORD, LPVOID) { return true; }