feat: tips模块完整性检查

This commit is contained in:
Rock Chin
2023-04-07 16:02:22 +08:00
parent a588d7f960
commit a68e29dff6
2 changed files with 26 additions and 3 deletions
+25 -3
View File
@@ -108,6 +108,7 @@ def reset_logging():
# 临时函数,用于加载config和上下文,未来统一放在config类 # 临时函数,用于加载config和上下文,未来统一放在config类
def load_config(): def load_config():
logging.info("检查config模块完整性.")
# 完整性校验 # 完整性校验
is_integrity = True is_integrity = True
config_template = importlib.import_module('config-template') config_template = importlib.import_module('config-template')
@@ -119,7 +120,7 @@ def load_config():
is_integrity = False is_integrity = False
if not is_integrity: if not is_integrity:
logging.warning("配置文件不完整,依据config-template.py检查config.py") logging.warning("配置文件不完整,您可以依据config-template.py检查config.py")
# 检查override.json覆盖 # 检查override.json覆盖
if os.path.exists("override.json"): if os.path.exists("override.json"):
@@ -132,13 +133,31 @@ def load_config():
logging.error("无法覆写配置[{}]为[{}],该配置不存在,请检查override.json是否正确".format(key, override_json[key])) logging.error("无法覆写配置[{}]为[{}],该配置不存在,请检查override.json是否正确".format(key, override_json[key]))
if not is_integrity: if not is_integrity:
logging.warning("以上配置已被设为默认值,将在5秒后继续启动... ") logging.warning("以上配置已被设为默认值,将在3秒后继续启动... ")
time.sleep(5) time.sleep(3)
# 存进上下文 # 存进上下文
pkg.utils.context.set_config(config) pkg.utils.context.set_config(config)
def complete_tips():
"""根据tips-custom-template模块补全tips模块的属性"""
is_integrity = True
logging.info("检查tips模块完整性.")
tips_template = importlib.import_module('tips-custom-template')
tips = importlib.import_module('tips')
for key in dir(tips_template):
if not key.startswith("__") and not hasattr(tips, key):
setattr(tips, key, getattr(tips_template, key))
logging.warning("[{}]不存在".format(key))
is_integrity = False
if not is_integrity:
logging.warning("tips模块不完整,您可以依据tips-custom-template.py检查tips.py")
logging.warning("以上配置已被设为默认值,将在3秒后继续启动... ")
time.sleep(3)
def start(first_time_init=False): def start(first_time_init=False):
"""启动流程,reload之后会被执行""" """启动流程,reload之后会被执行"""
@@ -405,6 +424,9 @@ def main():
load_config() load_config()
config = pkg.utils.context.get_config() config = pkg.utils.context.get_config()
# 检查tips模块
complete_tips()
# 配置线程池 # 配置线程池
from pkg.utils import ThreadCtl from pkg.utils import ThreadCtl
thread_ctl = ThreadCtl( thread_ctl = ThreadCtl(
+1
View File
@@ -54,6 +54,7 @@ def reload_all(notify=True):
# 执行启动流程 # 执行启动流程
logging.info("执行程序启动流程") logging.info("执行程序启动流程")
main.load_config() main.load_config()
main.complete_tips()
context.get_thread_ctl().reload( context.get_thread_ctl().reload(
admin_pool_num=context.get_config().admin_pool_num, admin_pool_num=context.get_config().admin_pool_num,
user_pool_num=context.get_config().user_pool_num user_pool_num=context.get_config().user_pool_num