Skip to content

Commit

Permalink
[bugfix] Use background context instead of request context for async …
Browse files Browse the repository at this point in the history
…processing (#888)

Fixes an issue where async processing was not completing correctly.

In particular this applies to side effects of domain blocks: while the domain block was being entered and enforced correctly, side effects like deleting accounts and updating the instance entry for the blocked instance were not. This fixes that :)
  • Loading branch information
tsmethurst authored Oct 4, 2022
1 parent 1a56352 commit 359ed1b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion internal/processing/admin/createdomainblock.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ func (p *processor) DomainBlockCreate(ctx context.Context, account *gtsmodel.Acc
block = &newBlock

// Process the side effects of the domain block asynchronously since it might take a while
go p.initiateDomainBlockSideEffects(ctx, account, block)
go func() {
p.initiateDomainBlockSideEffects(context.Background(), account, block)
}()
}

// Convert our gts model domain block into an API model
Expand Down
6 changes: 3 additions & 3 deletions internal/processing/admin/mediaprune.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func (p *processor) MediaPrune(ctx context.Context, mediaRemoteCacheDays int) gt
}

go func() {
pruned, err := p.mediaManager.PruneAllRemote(ctx, mediaRemoteCacheDays)
pruned, err := p.mediaManager.PruneAllRemote(context.Background(), mediaRemoteCacheDays)
if err != nil {
log.Errorf("MediaPrune: error pruning remote cache: %s", err)
} else {
Expand All @@ -42,7 +42,7 @@ func (p *processor) MediaPrune(ctx context.Context, mediaRemoteCacheDays int) gt
}()

go func() {
pruned, err := p.mediaManager.PruneUnusedLocalAttachments(ctx)
pruned, err := p.mediaManager.PruneUnusedLocalAttachments(context.Background())
if err != nil {
log.Errorf("MediaPrune: error pruning unused local cache: %s", err)
} else {
Expand All @@ -51,7 +51,7 @@ func (p *processor) MediaPrune(ctx context.Context, mediaRemoteCacheDays int) gt
}()

go func() {
pruned, err := p.mediaManager.PruneAllMeta(ctx)
pruned, err := p.mediaManager.PruneAllMeta(context.Background())
if err != nil {
log.Errorf("MediaPrune: error pruning meta: %s", err)
} else {
Expand Down

0 comments on commit 359ed1b

Please sign in to comment.