From e7bc3fe89a4f7bfb2d6283bac7b09dad9ae1f2df Mon Sep 17 00:00:00 2001
From: Nanako <469449812@qq.com>
Date: Mon, 20 May 2024 12:09:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=A4=9A=E7=BA=BF=E7=A8=8B=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=94=B9=E4=B8=BA=E5=8D=95=E7=BA=BF=E7=A8=8B=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E5=9C=A8=E7=A8=8B=E5=BA=8F=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E6=97=B6=E4=BC=9A=E9=81=AD=E9=81=87=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/application/application.cpp | 32 +++++++++++++++-----------------
 core/application/application.h   |  3 ---
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/core/application/application.cpp b/core/application/application.cpp
index 7fae5b4..f446fe8 100644
--- a/core/application/application.cpp
+++ b/core/application/application.cpp
@@ -1,12 +1,9 @@
 #include "application.h"
 
-#include <iostream>
-
 #include "misc/singleton/singleton_manager.h"
-#include "spdlog/async.h"
 #include "spdlog/spdlog.h"
-#include "spdlog/sinks/basic_file_sink.h"
-#include "spdlog/sinks/rotating_file_sink.h"
+#include "spdlog/sinks/daily_file_sink.h"
+#include "spdlog/sinks/stdout_color_sinks.h"
 
 application* g_application = nullptr;
 
@@ -15,14 +12,19 @@ application::application() {
 }
 
 void application::init() {
-    try {
-        auto max_size = 1048576 * 10; // 10MB
-        auto max_files = 3;
-        async_spdlog_ = spdlog::rotating_logger_mt<spdlog::async_factory>("async_rotating_logger", "logs/log.txt", max_size, max_files);
-        spdlog::set_default_logger(async_spdlog_);
-    } catch (const spdlog::spdlog_ex& ex) {
-        std::cout << "Log init failed: " << ex.what() << std::endl;
-    }
+    // 创建控制台日志记录器
+    auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_st>();
+    console_sink->set_level(spdlog::level::info); // 设置控制台日志级别
+
+    // 创建文件日志记录器
+    auto file_sink = std::make_shared<spdlog::sinks::daily_file_sink_st>("logs/log.txt", 0, 0); // 每天创建一个新的日志文件
+    file_sink->set_level(spdlog::level::info); // 设置文件日志级别
+
+    // 创建异步多路输出日志记录器，将日志输出到控制台和文件
+    spdlog::sinks_init_list sink_list = {console_sink, file_sink};
+    auto logger = std::make_shared<spdlog::logger>("", sink_list);
+    // 设置默认日志记录器
+    spdlog::set_default_logger(logger);
 
     singleton_manager::get()->init();
 }
@@ -31,8 +33,4 @@ void application::shutdown() {
     singleton_manager::get()->release();
     spdlog::drop_all();
     spdlog::shutdown();
-    async_spdlog_.reset();
-}
-
-void application::request_exit() {
 }
diff --git a/core/application/application.h b/core/application/application.h
index 8ac32ef..0a7c864 100644
--- a/core/application/application.h
+++ b/core/application/application.h
@@ -24,9 +24,6 @@ public:
 
     virtual void shutdown();
 
-    void request_exit();
-
     virtual void tick(float delta_time) {}
 protected:
-    std::shared_ptr<spdlog::logger> async_spdlog_;
 };