feat: 日志倒序输出

TheTNB · Nov 28, 2023 · e4e3ad5 · e4e3ad5
1 parent a80ddfa
commit e4e3ad5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/http/controllers/task_controller.go b/app/http/controllers/task_controller.go
@@ -62,9 +62,9 @@ func (r *TaskController) Log(ctx http.Context) http.Response {
 		return ErrorSystem(ctx)
 	}
 
-	log, err := tools.Exec("tail -n 1000 " + task.Log)
+	log, err := tools.Exec("tail -n 1000 " + task.Log + " | tac")
 	if err != nil {
-		return Error(ctx, http.StatusInternalServerError, log)
+		return Error(ctx, http.StatusInternalServerError, "日志已被清理")
 	}
 
 	return Success(ctx, log)

diff --git a/pkg/tools/tools.go b/pkg/tools/tools.go
@@ -474,10 +474,6 @@ func UpdatePanel(panelInfo PanelInfo) error {
 	if !Exists("/www/panel/database/panel.db") || !Exists("/www/panel/panel.conf") {
 		return errors.New("恢复面板配置失败")
 	}
-	if _, err = Exec("/www/panel/panel --env=panel.conf artisan migrate"); err != nil {
-		color.Redln("运行面板数据库迁移失败")
-		return err
-	}
 	color.Greenln("恢复完成")
 
 	color.Greenln("设置面板文件权限...")
@@ -487,6 +483,10 @@ func UpdatePanel(panelInfo PanelInfo) error {
 	}
 	color.Greenln("设置完成")
 
+	if _, err = Exec("/www/panel/panel --env=panel.conf artisan migrate"); err != nil {
+		color.Redln("运行面板数据库迁移失败")
+		return err
+	}
 	if _, err = Exec("bash /www/panel/scripts/update_panel.sh"); err != nil {
 		color.Redln("执行面板升级后脚本失败")
 		return err