diff options
| author | zeripath <art27@cantab.net> | 2022-01-20 00:26:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 00:26:57 +0100 |
| commit | 5cb0c9aa0d7eed087055b1efca79628957207d36 (patch) | |
| tree | d117a514e1f17e5f6bfcda1be273f6a971112663 /cmd | |
| parent | Upgrade Alpine from 3.13 to 3.15 (#18050) (diff) | |
| download | forgejo-5cb0c9aa0d7eed087055b1efca79628957207d36.tar.xz forgejo-5cb0c9aa0d7eed087055b1efca79628957207d36.zip | |
Propagate context and ensure git commands run in request context (#17868)
This PR continues the work in #17125 by progressively ensuring that git
commands run within the request context.
This now means that the if there is a git repo already open in the context it will be used instead of reopening it.
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/admin.go | 2 | ||||
| -rw-r--r-- | cmd/doctor.go | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmd/admin.go b/cmd/admin.go index 3c7f7c8a7c..3042df8bb7 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -669,7 +669,7 @@ func runRepoSyncReleases(_ *cli.Context) error { log.Trace("Processing next %d repos of %d", len(repos), count) for _, repo := range repos { log.Trace("Synchronizing repo %s with path %s", repo.FullName(), repo.RepoPath()) - gitRepo, err := git.OpenRepository(repo.RepoPath()) + gitRepo, err := git.OpenRepositoryCtx(ctx, repo.RepoPath()) if err != nil { log.Warn("OpenRepository: %v", err) continue diff --git a/cmd/doctor.go b/cmd/doctor.go index 54c18b83dc..35cc305f4c 100644 --- a/cmd/doctor.go +++ b/cmd/doctor.go @@ -5,7 +5,6 @@ package cmd import ( - "context" "fmt" golog "log" "os" @@ -116,7 +115,7 @@ func runRecreateTable(ctx *cli.Context) error { } recreateTables := migrations.RecreateTables(beans...) - return db.InitEngineWithMigration(context.Background(), func(x *xorm.Engine) error { + return db.InitEngineWithMigration(stdCtx, func(x *xorm.Engine) error { if err := migrations.EnsureUpToDate(x); err != nil { return err } |