ソースを参照

test(server): Auto update with git pull

huangrunheng 2 年 前
親
コミット
8ce9d964ab
4 ファイル変更、29 行追加、2 行削除
  1. 11 0
      module/server/home_router.py
  2. 12 0
      module/server/updater.py
  3. 2 1
      script.py
  4. 4 1
      server.py

+ 11 - 0
module/server/home_router.py

@@ -60,3 +60,14 @@ async def update_info():
     except Exception as e:
     except Exception as e:
         logger.error(e)
         logger.error(e)
         return None
         return None
+
+@home_app.get('/execute_update')
+async def execute_update():
+    # 下拉仓库 -> 关闭所有脚本进程 -> 最后重启oasx
+    try:
+        updater = Updater()
+        updater.execute_pull()
+    except Exception as e:
+        logger.error(e)
+    return '手动更新将会立即结束运行中的脚本服务, 最后你还需重启oasx'
+

+ 12 - 0
module/server/updater.py

@@ -121,6 +121,18 @@ class Updater(DeployConfig, GitManager, PipManager):
             logger.info(f"No update")
             logger.info(f"No update")
             return False
             return False
 
 
+    def execute_pull(self) -> bool:
+        source = "origin"
+        for _ in range(3):
+            if self.execute(
+                    f'"{self.git}" pull {source} {self.Branch} --no-rebase', allow_failure=True
+            ):
+                break
+        else:
+            logger.warning("Git fetch failed")
+            return False
+
+
 
 
 if __name__ == "__main__":
 if __name__ == "__main__":
     updater = Updater()
     updater = Updater()

+ 2 - 1
script.py

@@ -386,7 +386,8 @@ class Script:
             logger.critical('This is likely to be a mistake of developers, but sometimes just random issues')
             logger.critical('This is likely to be a mistake of developers, but sometimes just random issues')
             self.config.notifier.push(title=command, content=f"<{self.config_name}> ScriptError")
             self.config.notifier.push(title=command, content=f"<{self.config_name}> ScriptError")
             exit(1)
             exit(1)
-        except RequestHumanTakeover:
+        except RequestHumanTakeover as e:
+            logger.critical(e)
             logger.critical('Request human takeover')
             logger.critical('Request human takeover')
             self.config.notifier.push(title=command, content=f"<{self.config_name}> RequestHumanTakeover")
             self.config.notifier.push(title=command, content=f"<{self.config_name}> RequestHumanTakeover")
             exit(1)
             exit(1)

+ 4 - 1
server.py

@@ -54,7 +54,10 @@ def fun(ev: threading.Event):
     logger.attr("Port", port)
     logger.attr("Port", port)
     logger.attr("Reload", ev is not None)
     logger.attr("Reload", ev is not None)
 
 
-    uvicorn.run("module.server.app:fastapi_app", host=host, port=port, factory=True)
+    uvicorn.run("module.server.app:fastapi_app",
+                host=host,
+                port=port,
+                factory=True)