mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel synced 2024-11-22 07:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 解决删除备份文件路径错误的问题 (#3829)

Browse Source
This commit is contained in:
ssongliu 2024-02-05 10:18:43 +08:00 committed by GitHub
parent 9b8b9f505b
commit 8e620172e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
backend/app/service/backup.go
View File

@ -266,22 +266,16 @@ func (u *BackupService) BatchDeleteRecord(ids []uint) error {
return err return err
} }
for _, record := range records { for _, record := range records {
if record.Source == "LOCAL" { backupAccount, err := backupRepo.Get(commonRepo.WithByType(record.Source))
if err := os.Remove(record.FileDir + "/" + record.FileName); err != nil { if err != nil {
global.LOG.Errorf("remove file %s failed, err: %v", record.FileDir+record.FileName, err) return err
} }
} else { client, err := u.NewClient(&backupAccount)
backupAccount, err := backupRepo.Get(commonRepo.WithByType(record.Source)) if err != nil {
if err != nil { return err
return err }
} if _, err = client.Delete(path.Join(record.FileDir, record.FileName)); err != nil {
client, err := u.NewClient(&backupAccount) global.LOG.Errorf("remove file %s from %s failed, err: %v", path.Join(record.FileDir, record.FileName), record.Source, err)
if err != nil {
return err
}
if _, err = client.Delete(record.FileDir + record.FileName); err != nil {
global.LOG.Errorf("remove file %s from %s failed, err: %v", record.FileDir+record.FileName, record.Source, err)
}
} }
} }
return backupRepo.DeleteRecord(context.Background(), commonRepo.WithIdsIn(ids)) return backupRepo.DeleteRecord(context.Background(), commonRepo.WithIdsIn(ids))