diff --git a/agent/app/service/backup_app.go b/agent/app/service/backup_app.go index 026e806e7..976c3f0d6 100644 --- a/agent/app/service/backup_app.go +++ b/agent/app/service/backup_app.go @@ -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() } diff --git a/agent/app/service/backup_mysql.go b/agent/app/service/backup_mysql.go index 6a504e2a7..8c4190552 100644 --- a/agent/app/service/backup_mysql.go +++ b/agent/app/service/backup_mysql.go @@ -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() } diff --git a/agent/app/service/backup_postgresql.go b/agent/app/service/backup_postgresql.go index d74c70a9a..2a3b7ccc3 100644 --- a/agent/app/service/backup_postgresql.go +++ b/agent/app/service/backup_postgresql.go @@ -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() } diff --git a/agent/app/service/backup_website.go b/agent/app/service/backup_website.go index e9e936fbd..51b617928 100644 --- a/agent/app/service/backup_website.go +++ b/agent/app/service/backup_website.go @@ -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() }