diff --git a/agent/app/service/device_clean.go b/agent/app/service/device_clean.go index 5656ca92d540..122d6efec7fc 100644 --- a/agent/app/service/device_clean.go +++ b/agent/app/service/device_clean.go @@ -647,11 +647,13 @@ func dropTaskLog(logDir string) { if err == nil { _ = xpackDB.Table("tampers").Where("task_id != ?", "").Select("task_id").Find(&usedTasks).Error } + defer common.CloseDB(xpackDB) case "System": xpackDB, err := common.LoadDBConnByPathWithErr(path.Join(global.CONF.Base.InstallDir, "1panel/db/xpack.db"), "xpack.db") if err == nil { _ = xpackDB.Model("nodes").Where("task_id != ?", "").Select("task_id").Find(&usedTasks).Error } + defer common.CloseDB(xpackDB) default: dropFileOrDir(logDir) _ = taskRepo.Delete(repo.WithByType(taskType)) diff --git a/agent/app/service/snapshot_create.go b/agent/app/service/snapshot_create.go index e9af6cae7901..937c26a953d6 100644 --- a/agent/app/service/snapshot_create.go +++ b/agent/app/service/snapshot_create.go @@ -259,11 +259,12 @@ func loadDbConn(snap *snapHelper, targetDir string, req dto.SnapshotCreate) erro return err } } else { - taskDB, err := common.LoadDBConnByPathWithErr(path.Join(targetDir, "db/task.db"), "core.db") + taskDB, err := common.LoadDBConnByPathWithErr(path.Join(targetDir, "db/task.db"), "task.db") snap.Task.LogWithStatus(i18n.GetWithName("SnapNewDB", "task"), err) if err != nil { return err } + defer common.CloseDB(taskDB) _ = taskDB.Where("id = ?", req.TaskID).Delete(&model.Task{}).Error } if !req.WithOperationLog && global.IsMaster {