소스 검색

fix(module): Automatically execute script instance for starting the web service #1325

huangrunheng 10 달 전
부모
커밋
c0f2ba87f3
4개의 변경된 파일과 43개의 추가작업 그리고 10개의 파일을 삭제
  1. 22 3
      module/server/app.py
  2. 16 3
      module/server/main_manager.py
  3. 3 1
      module/server/script_process.py
  4. 2 3
      module/server/script_router.py

+ 22 - 3
module/server/app.py

@@ -4,15 +4,17 @@
 from contextlib import asynccontextmanager
 
 import argparse
+from starlette import status
+from starlette.responses import JSONResponse
 from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 
 from module.logger import logger
-
 from module.server.home_router import home_app
 from module.server.script_router import script_app
-from starlette import status
-from starlette.responses import JSONResponse
+from module.server.setting import State
+from module.server.main_manager import mm
+
 
 
 @asynccontextmanager
@@ -20,6 +22,7 @@ async def lifespan(app: FastAPI):
     await on_startup()
     yield
     await on_shutdown()
+
 app = FastAPI(
     title='OAS',
     description='OAS web service',
@@ -40,7 +43,12 @@ app.include_router(script_app)
 
 
 async def on_startup():
+    """
+    app.state 的生命周期在定义app的时候就有了
+    :return:
+    """
     logger.info('OAS web service startup done')
+    await mm.restart_processes(app.state.script_instances)
 
 
 async def on_shutdown():
@@ -78,5 +86,16 @@ def fastapi_app():
         help="Run OAS by config names on startup",
     )
     args, _ = parser.parse_known_args()
+    # ------------------------------------------------------------------------------------------------------------------
+
+    runs = None
+    if args.run:
+        runs = args.run
+    elif State.deploy_config.Run:
+        # TODO: refactor poor_yaml_read() to support list
+        tmp = State.deploy_config.Run.split(",")
+        runs = [l.strip(" ['\"]") for l in tmp if len(l)]
+    # ------------------------------------------------------------------------------------------------------------------
+    app.state.script_instances = runs
 
     return app

+ 16 - 3
module/server/main_manager.py

@@ -42,6 +42,10 @@ class MainManager(ConfigManager):
     #         self.config_cache = Config(config_name)
     #     return self.config_cache
 
+    @staticmethod
+    def config_cache(name: str) -> Config:
+        return Config(name)
+
     def add_script_file(self, file_name: str):
         # 当你添加了新的脚本文件后,需要添加缓存的列表
         if file_name in self._all_script_files:
@@ -95,7 +99,16 @@ class MainManager(ConfigManager):
                     tasks[coroutine_log_name] = asyncio.create_task(script_p.coroutine_broadcast_log(),
                                                                     name=coroutine_log_name)
 
-    @staticmethod
-    def config_cache(name: str) -> Config:
-        return Config(name)
+    async def restart_processes(self, script_instances: list[str]):
+        for instance in script_instances:
+            logger.info(f'Restart script {instance}')
+            if instance not in self.script_process:
+                try:
+                    self.script_process[instance] = ScriptProcess(instance)
+                except FileNotFoundError:
+                    logger.error(f'{instance} file not found')
+                    continue
+            await self.script_process[instance].start()
+
 
+mm = MainManager()

+ 3 - 1
module/server/script_process.py

@@ -9,7 +9,7 @@ from asyncio import QueueEmpty, CancelledError, sleep
 from enum import Enum
 
 from module.logger import logger
-
+from module.server.config_manager import ConfigManager
 from module.server.script_websocket import ScriptWSManager
 
 
@@ -24,6 +24,8 @@ class ScriptProcess(ScriptWSManager):
 
     def __init__(self, config_name: str) -> None:
         super().__init__()
+        if config_name not in ConfigManager.all_script_files():
+            raise FileNotFoundError(f'{config_name}.json not found')
         self.config_name = config_name  # config_name
         self.log_pipe_out, self.log_pipe_in = multiprocessing.Pipe(False)
         self.state_queue = multiprocessing.Queue()

+ 2 - 3
module/server/script_router.py

@@ -6,18 +6,17 @@ from fastapi import APIRouter, HTTPException
 from fastapi.responses import StreamingResponse
 from fastapi import WebSocket, WebSocketDisconnect
 from datetime import datetime
-from module.config.config import Config
 from module.config.utils import convert_to_underscore
 
 from module.logger import logger
-from module.server.main_manager import MainManager
+from module.server.main_manager import mm
 from module.server.script_process import ScriptProcess, ScriptState
 
 from tasks.Component.config_base import TimeDelta
 
 
 script_app = APIRouter()
-mm = MainManager()
+
 
 @script_app.get('/test')
 async def script_test():