From 22dfed741e2317ff120f998f0f31dff93a7c2fca Mon Sep 17 00:00:00 2001 From: Rewrite0 Date: Thu, 26 Sep 2024 09:15:54 +0800 Subject: [PATCH] fix: program restart error --- backend/src/module/api/program.py | 7 +++++-- backend/src/module/core/program.py | 13 +++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/backend/src/module/api/program.py b/backend/src/module/api/program.py index 72803aac..31f3acc4 100644 --- a/backend/src/module/api/program.py +++ b/backend/src/module/api/program.py @@ -32,7 +32,7 @@ async def shutdown(): ) async def restart(): try: - resp = program.restart() + resp = await program.restart() return u_response(resp) except Exception as e: logger.debug(e) @@ -97,7 +97,10 @@ async def shutdown_program(): os.kill(os.getpid(), signal.SIGINT) return JSONResponse( status_code=200, - content={"msg_en": "Shutdown program successfully.", "msg_zh": "关闭程序成功。"}, + content={ + "msg_en": "Shutdown program successfully.", + "msg_zh": "关闭程序成功。", + }, ) diff --git a/backend/src/module/core/program.py b/backend/src/module/core/program.py index 06063450..7534b848 100644 --- a/backend/src/module/core/program.py +++ b/backend/src/module/core/program.py @@ -3,7 +3,13 @@ from module.conf import VERSION, settings from module.models import ResponseModel -from module.update import data_migration, first_run, from_30_to_31, start_up, cache_image +from module.update import ( + data_migration, + first_run, + from_30_to_31, + start_up, + cache_image, +) from .sub_thread import RenameThread, RSSThread @@ -71,7 +77,6 @@ async def start(self): msg_zh="程序启动成功。", ) - def stop(self): if self.is_running: self.stop_event.set() @@ -91,9 +96,9 @@ def stop(self): msg_zh="程序未运行。", ) - def restart(self): + async def restart(self): self.stop() - self.start() + await self.start() return ResponseModel( status=True, status_code=200,