From 837dacba87ecc66676ff01e9a22f6fe2d04c595c Mon Sep 17 00:00:00 2001 From: zhengkunwang223 <1paneldev@sina.com> Date: Mon, 2 Feb 2026 17:12:52 +0800 Subject: [PATCH] fix: resolve migration failure when reinstalling OpenResty --- agent/app/service/app_utils.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/agent/app/service/app_utils.go b/agent/app/service/app_utils.go index 03d76d3de603..0b55667ca758 100644 --- a/agent/app/service/app_utils.go +++ b/agent/app/service/app_utils.go @@ -2016,23 +2016,26 @@ func handleSiteDir(app model.App, appDetail model.AppDetail, req request.AppInst req.Params["WEBSITE_DIR"] = siteDir oldWebStePath, _ := settingRepo.GetValueByKey("WEBSITE_DIR") fileOp := files.NewFileOp() + movePath := func(src, dst string) error { + return cmd.NewCommandMgr().Run("mv", src, dst) + } if oldWebStePath != "" && oldWebStePath != siteDir && fileOp.Stat(oldWebStePath) { t.Log(i18n.GetWithName("MoveSiteDir", siteDir)) if fileOp.Stat(siteDir) { if fileOp.Stat(path.Join(siteDir, "conf.d")) { - _ = fileOp.Rename(path.Join(siteDir, "conf.d"), path.Join(siteDir, "conf.d.bak")) + _ = movePath(path.Join(siteDir, "conf.d"), path.Join(siteDir, "conf.d.bak")) } if fileOp.Stat(path.Join(siteDir, "sites")) { - _ = fileOp.Rename(path.Join(siteDir, "sites"), path.Join(siteDir, "sites.bak")) + _ = movePath(path.Join(siteDir, "sites"), path.Join(siteDir, "sites.bak")) } - if err := fileOp.Rename(path.Join(oldWebStePath, "sites"), path.Join(siteDir, "sites")); err != nil { + if err := movePath(path.Join(oldWebStePath, "sites"), path.Join(siteDir, "sites")); err != nil { return err } - if err := fileOp.Rename(path.Join(oldWebStePath, "conf.d"), path.Join(siteDir, "conf.d")); err != nil { + if err := movePath(path.Join(oldWebStePath, "conf.d"), path.Join(siteDir, "conf.d")); err != nil { return err } } else { - err := fileOp.Rename(oldWebStePath, siteDir) + err := movePath(oldWebStePath, siteDir) if err != nil { return err }