From 8e09e01ef6a752b85f3686a7337862e038627e69 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 27 Aug 2024 23:35:32 -0700 Subject: [PATCH] Use correct ctx usage --- services/pull/merge.go | 12 ++++++------ services/repository/transfer.go | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/services/pull/merge.go b/services/pull/merge.go index f15132a37c..735c5e3df9 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -182,7 +182,7 @@ func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.U return models.ErrInvalidMergeStyle{ID: pr.BaseRepo.ID, Style: mergeStyle} } - lockCtx, releaser, err := globallock.Lock(ctx, getPullWorkingLockKey(pr.ID)) + ctx, releaser, err := globallock.Lock(ctx, getPullWorkingLockKey(pr.ID)) if err != nil { log.Error("lock.Lock(): %v", err) return fmt.Errorf("lock.Lock: %w", err) @@ -192,8 +192,8 @@ func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.U go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false, "", "") }() - _, err = doMergeAndPush(lockCtx, pr, doer, mergeStyle, expectedHeadCommitID, message, repo_module.PushTriggerPRMergeToBase) - releaser() + _, err = doMergeAndPush(ctx, pr, doer, mergeStyle, expectedHeadCommitID, message, repo_module.PushTriggerPRMergeToBase) + ctx = releaser() if err != nil { return err } @@ -492,13 +492,13 @@ func CheckPullBranchProtections(ctx context.Context, pr *issues_model.PullReques // MergedManually mark pr as merged manually func MergedManually(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User, baseGitRepo *git.Repository, commitID string) error { - lockCtx, releaser, err := globallock.Lock(ctx, getPullWorkingLockKey(pr.ID)) + ctx, releaser, err := globallock.Lock(ctx, getPullWorkingLockKey(pr.ID)) if err != nil { log.Error("lock.Lock(): %v", err) return fmt.Errorf("lock.Lock: %w", err) } - err = db.WithTx(lockCtx, func(ctx context.Context) error { + err = db.WithTx(ctx, func(ctx context.Context) error { if err := pr.LoadBaseRepo(ctx); err != nil { return err } @@ -549,7 +549,7 @@ func MergedManually(ctx context.Context, pr *issues_model.PullRequest, doer *use } return nil }) - releaser() + ctx = releaser() if err != nil { return err } diff --git a/services/repository/transfer.go b/services/repository/transfer.go index aff900bda0..fa129e76c3 100644 --- a/services/repository/transfer.go +++ b/services/repository/transfer.go @@ -42,17 +42,17 @@ func TransferOwnership(ctx context.Context, doer, newOwner *user_model.User, rep oldOwner := repo.Owner - lockCtx, releaser, err := globallock.Lock(ctx, getRepoWorkingLockKey(repo.ID)) + ctx, releaser, err := globallock.Lock(ctx, getRepoWorkingLockKey(repo.ID)) if err != nil { log.Error("lock.Lock(): %v", err) return fmt.Errorf("lock.Lock: %w", err) } - if err := transferOwnership(lockCtx, doer, newOwner.Name, repo); err != nil { + if err := transferOwnership(ctx, doer, newOwner.Name, repo); err != nil { releaser() return err } - releaser() + ctx = releaser() newRepo, err := repo_model.GetRepositoryByID(ctx, repo.ID) if err != nil { @@ -368,17 +368,17 @@ func ChangeRepositoryName(ctx context.Context, doer *user_model.User, repo *repo // repo so that we can automatically rename the repo path and updates the // local copy's origin accordingly. - lockCtx, releaser, err := globallock.Lock(ctx, getRepoWorkingLockKey(repo.ID)) + ctx, releaser, err := globallock.Lock(ctx, getRepoWorkingLockKey(repo.ID)) if err != nil { log.Error("lock.Lock(): %v", err) return fmt.Errorf("lock.Lock: %w", err) } - if err := changeRepositoryName(lockCtx, repo, newRepoName); err != nil { + if err := changeRepositoryName(ctx, repo, newRepoName); err != nil { releaser() return err } - releaser() + ctx = releaser() repo.Name = newRepoName notify_service.RenameRepository(ctx, doer, repo, oldRepoName)