Browse Source

Fix incorrect ctx usage in defer function (#27740) (#27741)

tags/v1.21.0
wxiaoguang 7 months ago
parent
commit
c279f8aab7
No account linked to committer's email address
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      services/task/migrate.go

+ 2
- 2
services/task/migrate.go View File

@@ -42,7 +42,7 @@ func handleCreateError(owner *user_model.User, err error) error {
}

func runMigrateTask(ctx context.Context, t *admin_model.Task) (err error) {
defer func() {
defer func(ctx context.Context) {
if e := recover(); e != nil {
err = fmt.Errorf("PANIC whilst trying to do migrate task: %v", e)
log.Critical("PANIC during runMigrateTask[%d] by DoerID[%d] to RepoID[%d] for OwnerID[%d]: %v\nStacktrace: %v", t.ID, t.DoerID, t.RepoID, t.OwnerID, e, log.Stack(2))
@@ -69,7 +69,7 @@ func runMigrateTask(ctx context.Context, t *admin_model.Task) (err error) {
}

// then, do not delete the repository, otherwise the users won't be able to see the last error
}()
}(graceful.GetManager().ShutdownContext()) // even if the parent ctx is canceled, this defer-function still needs to update the task record in database

if err = t.LoadRepo(ctx); err != nil {
return err

Loading…
Cancel
Save