From 91bc86bd0770268a5ab5ea0df2135e25c29da13a Mon Sep 17 00:00:00 2001
From: KimigaiiWuyi <444835641@qq.com>
Date: Tue, 1 Oct 2024 00:58:17 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E5=B0=86=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=A0=86=E6=A0=88=E8=AE=B0=E5=BD=95=E8=87=B3?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=20(#74)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gsuid_core/logger.py | 9 ++++-----
 gsuid_core/server.py | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/gsuid_core/logger.py b/gsuid_core/logger.py
index 8e8239c..c0925e2 100644
--- a/gsuid_core/logger.py
+++ b/gsuid_core/logger.py
@@ -2,10 +2,10 @@ import sys
 import asyncio
 import logging
 import datetime
-import traceback
 from typing import TYPE_CHECKING, List
 
 import loguru
+from uvicorn.config import LOGGING_CONFIG
 
 from gsuid_core.config import core_config
 from gsuid_core.models import Event, Message
@@ -23,6 +23,8 @@ if TYPE_CHECKING:
     from loguru import Logger
 
 logger: 'Logger' = loguru.logger
+logging.getLogger().handlers = []
+LOGGING_CONFIG["disable_existing_loggers"] = False
 
 
 # https://loguru.readthedocs.io/en/stable/overview.html#entirely-compatible-with-standard-logging
@@ -44,9 +46,6 @@ class LoguruHandler(logging.Handler):  # pragma: no cover
 
 
 def format_event(record):
-    if record['exception']:
-        return f'{traceback.print_tb(record["exception"].traceback)} \n'
-
     if 'trigger' in record['extra']:
         _tg = record['extra']['trigger']
         message = (
@@ -105,7 +104,7 @@ def format_event(record):
     time = '<g>{time:MM-DD HH:mm:ss}</g>'
     level = '[<lvl>{level}</lvl>]'
     def_name = f'<c><u>{".".join(def_name.split(".")[-5:])}</u></c>'
-    _log = f'{time} {level} {def_name} | {message} \n'
+    _log = f'{time} {level} {def_name} | {message} \n {{exception}}'
     return _log
 
 
diff --git a/gsuid_core/server.py b/gsuid_core/server.py
index c2f06db..793e84d 100644
--- a/gsuid_core/server.py
+++ b/gsuid_core/server.py
@@ -269,7 +269,7 @@ def install_dependencies(dependencies: Dict, need_update: bool = False):
             if retcode != 0:
                 logger.warning('[安装/更新依赖] 安装失败（将会重试一次）')
                 if ' python -m' in start_tool:
-                    start_tool = start_tool.replace('python -m', '')
+                    start_tool = start_tool.replace(' python -m', '')
                     CMD = (
                         f'{start_tool} install "{dependency}{version}" {extra}'
                     )