acepanel/panel
2
0
Fork 0
mirror of https://github.com/acepanel/panel.git synced 2026-02-04 09:13:49 +08:00
Code Issues Packages Releases Activity

feat: 日志倒序输出

Browse Source
This commit is contained in:
耗子
2023-11-29 02:26:23 +08:00
parent a80ddfaebc
commit e4e3ad5821
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/http/controllers/task_controller.go
View File

@@ -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)

8
pkg/tools/tools.go
View File

@@ -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