1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-01-04 05:56:04 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix the problem of failed application backup (#8752)

Browse source
This commit is contained in:
ssongliu 2025-05-20 15:05:22 +08:00 • committed by GitHub
parent 538468a81d
commit c2101824ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
agent/app/service/backup_app.go
View file

@ -143,10 +143,10 @@ func handleAppBackup(install *model.AppInstall, parentTask *task.Task, backupDir
}
}
itemHandler := doAppBackup(install, backupTask, backupDir, fileName, excludes, secret)
backupTask.AddSubTask(task.GetTaskName(install.Name, task.TaskBackup, task.TaskScopeApp), func(t *task.Task) error { return itemHandler }, nil)
itemHandler := func() error { return doAppBackup(install, backupTask, backupDir, fileName, excludes, secret) }
backupTask.AddSubTask(task.GetTaskName(install.Name, task.TaskBackup, task.TaskScopeApp), func(t *task.Task) error { return itemHandler() }, nil)
if parentTask != nil {
return itemHandler
return itemHandler()
}
return backupTask.Execute()
}

6
agent/app/service/backup_mysql.go
View file

@ -122,10 +122,10 @@ func handleMysqlBackup(db DatabaseHelper, parentTask *task.Task, targetDir, file
}
}
itemHandler := doMysqlBackup(db, targetDir, fileName)
backupTask.AddSubTask(task.GetTaskName(itemName, task.TaskBackup, task.TaskScopeApp), func(t *task.Task) error { return itemHandler }, nil)
itemHandler := func() error { return doMysqlBackup(db, targetDir, fileName) }
backupTask.AddSubTask(task.GetTaskName(itemName, task.TaskBackup, task.TaskScopeDatabase), func(t *task.Task) error { return itemHandler() }, nil)
if parentTask != nil {
return itemHandler
return itemHandler()
}
return backupTask.Execute()
}

6
agent/app/service/backup_postgresql.go
View file

@ -118,10 +118,10 @@ func handlePostgresqlBackup(db DatabaseHelper, parentTask *task.Task, targetDir,
}
}
itemHandler := doPostgresqlgBackup(db, targetDir, fileName)
backupTask.AddSubTask(task.GetTaskName(itemName, task.TaskBackup, task.TaskScopeApp), func(task *task.Task) error { return itemHandler }, nil)
itemHandler := func() error { return doPostgresqlgBackup(db, targetDir, fileName) }
backupTask.AddSubTask(task.GetTaskName(itemName, task.TaskBackup, task.TaskScopeWebsite), func(task *task.Task) error { return itemHandler() }, nil)
if parentTask != nil {
return itemHandler
return itemHandler()
}
return backupTask.Execute()
}

6
agent/app/service/backup_website.go
View file

@ -215,10 +215,10 @@ func handleWebsiteBackup(website *model.Website, parentTask *task.Task, backupDi
return err
}
}
itemHandler := doWebsiteBackup(website, backupTask, backupDir, fileName, excludes, secret)
backupTask.AddSubTask(task.GetTaskName(website.Alias, task.TaskBackup, task.TaskScopeApp), func(task *task.Task) error { return itemHandler }, nil)
itemHandler := func() error { return doWebsiteBackup(website, backupTask, backupDir, fileName, excludes, secret) }
backupTask.AddSubTask(task.GetTaskName(website.Alias, task.TaskBackup, task.TaskScopeWebsite), func(t *task.Task) error { return itemHandler() }, nil)
if parentTask != nil {
return itemHandler
return itemHandler()
}
return backupTask.Execute()
}