Skip to content

Commit 0335def

Browse files
committed
revert all to old hammer context
1 parent c198a69 commit 0335def

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

routers/api/v1/repo/migrate.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ func Migrate(ctx *context.APIContext) {
200200
}
201201
}()
202202

203-
migratedRepo, err := migrations.MigrateRepository(graceful.GetManager().HammerContext(), doer, repoOwner.Name, opts, nil)
203+
migratedRepo, err := migrations.MigrateRepository(ctx, doer, repoOwner.Name, opts, nil)
204204
if err != nil {
205205
return nil, err
206206
}
@@ -209,7 +209,9 @@ func Migrate(ctx *context.APIContext) {
209209
}
210210

211211
// use a background context, don't cancel the migration even if the client goes away
212-
migratedRepo, err := doLongTimeMigrate(graceful.GetManager().ShutdownContext(), ctx.Doer)
212+
// HammerContext doesn't seem right (from https://github.com/go-gitea/gitea/pull/9335/files)
213+
// There are other abuses, maybe most HammerContext abuses should be fixed together in the future.
214+
migratedRepo, err := doLongTimeMigrate(graceful.GetManager().HammerContext(), ctx.Doer)
213215
if err != nil {
214216
handleMigrateError(ctx, repoOwner, err)
215217
return

0 commit comments

Comments
 (0)