remove log(use less

This commit is contained in:
shenjack 2023-06-17 14:36:43 +08:00
parent 9cd2756b30
commit bb14fa4634
6 changed files with 5 additions and 57 deletions

View File

@ -21,6 +21,4 @@ __all__ = [
# 类型定义
'mod',
# mod api
'log'
# log api
]

View File

@ -1,16 +0,0 @@
# -------------------------------
# Difficult Rocket
# Copyright © 2020-2023 by shenjackyuanjie 3695888@qq.com
# All rights reserved
# -------------------------------
from Difficult_Rocket.utils.log import (get_named_client_logger,
get_named_server_logger,
get_named_main_logger)
__all__ = [
'get_named_client_logger',
'get_named_server_logger',
'get_named_main_logger',
]

View File

@ -1,34 +0,0 @@
# -------------------------------
# Difficult Rocket
# Copyright © 2020-2023 by shenjackyuanjie 3695888@qq.com
# All rights reserved
# -------------------------------
import logging
from typing import Callable
__all__ = [
'get_named_client_logger',
'get_named_server_logger',
'get_named_main_logger',
]
def _gen_get_named_logger(from_name: str) -> Callable[[str], logging.Logger]:
def get_named_logger(name: str) -> logging.Logger:
logger = logging.getLogger(from_name)
logger.name = f'{from_name}.{name}'
return logger
return get_named_logger
get_named_client_logger = _gen_get_named_logger('client')
# 用于获取一个基于 client 配置的 logger
get_named_server_logger = _gen_get_named_logger('server')
# 用于获取一个基于 server 配置的 logger
get_named_main_logger = _gen_get_named_logger('main')
# 用于获取一个基于 main 配置的 logger

View File

@ -121,7 +121,7 @@ class CompilerHelper(Options):
_add_cmd(cmd_list, f'--file-version={self.file_version}' if self.file_version else None)
_add_cmd(cmd_list, f'--product-version={self.product_version}' if self.product_version else None)
_add_cmd(cmd_list, f'--file-description={self.file_description}' if self.file_description else None)
_add_cmd(cmd_list, f'--copy-right={self.copy_right}' if self.copy_right else None)
_add_cmd(cmd_list, f'--copyright={self.copy_right}' if self.copy_right else None)
_add_cmd(cmd_list, f'--follow-import-to={",".join(self.follow_import)}' if self.follow_import else None)
_add_cmd(cmd_list, f'--nofollow-import-to={",".join(self.no_follow_import)}' if self.no_follow_import else None)

View File

@ -4,6 +4,7 @@
# All rights reserved
# -------------------------------
import logging
import warnings
import traceback
@ -15,12 +16,11 @@ from Difficult_Rocket.main import Console
from Difficult_Rocket.api.mod import ModInfo
from Difficult_Rocket.client import ClientWindow
from Difficult_Rocket.api.types import Options, Version
from Difficult_Rocket.api.log import get_named_client_logger
DR_rust_version = Version("0.2.10.1") # DR_mod 的 Rust 编写部分的兼容版本
logger = get_named_client_logger('dr_game')
logger = logging.getLogger('client.dr_game')
class _DR_mod_runtime(Options):

View File

@ -7,6 +7,7 @@
# import math
import time
import random
import logging
import traceback
# from xml.etree import ElementTree
from xml.etree.ElementTree import Element
@ -31,7 +32,6 @@ from Difficult_Rocket.utils.translate import tr
from Difficult_Rocket.api.types import Fonts, Options
from Difficult_Rocket.command.line import CommandText
from Difficult_Rocket.client.screen import BaseScreen
from Difficult_Rocket.api.log import get_named_client_logger
from .types import SR1Textures, SR1PartTexture, SR1PartData, SR1Rotation, xml_bool
if TYPE_CHECKING:
@ -40,7 +40,7 @@ if TYPE_CHECKING:
if DR_mod_runtime.use_DR_rust:
from .Difficult_Rocket_rs import CenterCamera_rs, SR1PartList_rs, SR1Ship_rs
logger = get_named_client_logger('dr_game_sr1_ship')
logger = logging.getLogger('client.dr_game_sr1_ship')
def get_sr1_part(part_xml: Element) -> Optional[SR1PartData]: