From fb6414f2e3b6103d75840c6a198d29aedcdc75d4 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Thu, 11 May 2023 16:38:38 +0800 Subject: [PATCH] Fix status bug. Fix log level of uvicorn access. --- src/main.py | 17 ++++++++--------- src/module/api/config.py | 4 ++-- src/module/api/program.py | 6 +++--- src/module/core/sub_thread.py | 6 ++++-- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/main.py b/src/main.py index 70bbc778..f808203e 100644 --- a/src/main.py +++ b/src/main.py @@ -1,4 +1,3 @@ -import os import logging import uvicorn @@ -8,22 +7,22 @@ from module.conf import settings, setup_logger log_level = logging.DEBUG if settings.log.debug_enable else logging.INFO setup_logger(log_level, reset=True) logger = logging.getLogger(__name__) - - uvicorn_logging_config = { "version": 1, "disable_existing_loggers": False, "handlers": logger.handlers, "loggers": { - "uvicorn": { - "level": log_level, - }, -}} - + "uvicorn": { + "level": log_level, + }, + "uvicorn.access": { + "level": "WARNING", + }, + } +} if __name__ == "__main__": uvicorn.run( router, host="0.0.0.0", port=settings.program.webui_port, log_config=uvicorn_logging_config, ) - diff --git a/src/module/api/config.py b/src/module/api/config.py index f8294ae1..dacc8151 100644 --- a/src/module/api/config.py +++ b/src/module/api/config.py @@ -18,7 +18,7 @@ async def update_config(config: Config): try: settings.save(config_dict=config.dict()) logger.info("Config updated") - return {"status": "Success"} + return {"message": "Success"} except Exception as e: logger.warning(e) - return {"status": "Failed to update config"} + return {"message": "Failed to update config"} diff --git a/src/module/api/program.py b/src/module/api/program.py index 097718f1..34564f3d 100644 --- a/src/module/api/program.py +++ b/src/module/api/program.py @@ -56,17 +56,17 @@ async def shutdown_program(): # Check status -@router.get("/api/v1/check/downloader", tags=["program"]) +@router.get("/api/v1/check/downloader", tags=["check"]) async def check_downloader_status(): return check_downloader() -@router.get("/api/v1/check/rss", tags=["program"]) +@router.get("/api/v1/check/rss", tags=["check"]) async def check_rss_status(): return check_rss() -@router.get("/api/v1/check", tags=["program"]) +@router.get("/api/v1/check", tags=["check"]) async def check_all(): return check_status() diff --git a/src/module/core/sub_thread.py b/src/module/core/sub_thread.py index cfee790c..0ce31151 100644 --- a/src/module/core/sub_thread.py +++ b/src/module/core/sub_thread.py @@ -95,8 +95,10 @@ def first_run(): async def start_program(): global rss_thread, rename_thread start_info() - if check_status(): - # First init + if not check_status(): + stop_event.set() + logger.info("Program paused.") + else: first_run() with BangumiDatabase() as database: database.update_table()