diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2022-11-11 11:01:53 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-11-11 12:01:53 +0100 |
| commit | 3ce0e33f99ad127e9ce6bb3d0ba5fdf034999fb7 (patch) | |
| tree | 8de21fe2a1e682f7a8c7e6577d2af49930f502bd /internal/media/processingmedia.go | |
| parent | [docs] postgres collation warning (#1017) (diff) | |
| download | gotosocial-3ce0e33f99ad127e9ce6bb3d0ba5fdf034999fb7.tar.xz | |
[chore] close in-storage media reader _before_ opening write, no need to leave it hanging around (#1016)
Signed-off-by: kim <grufwub@gmail.com>
Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/media/processingmedia.go')
| -rw-r--r-- | internal/media/processingmedia.go | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/internal/media/processingmedia.go b/internal/media/processingmedia.go index 573df1d0e..1247586cb 100644 --- a/internal/media/processingmedia.go +++ b/internal/media/processingmedia.go @@ -137,22 +137,15 @@ func (p *ProcessingMedia) loadThumb(ctx context.Context) error { } // stream the original file out of storage - log.Tracef("loadThumb: fetching attachment from storage %s", p.attachment.URL) stored, err := p.storage.GetStream(ctx, p.attachment.File.Path) if err != nil { p.err = fmt.Errorf("loadThumb: error fetching file from storage: %s", err) atomic.StoreInt32(&p.thumbState, int32(errored)) return p.err } - - defer func() { - if err := stored.Close(); err != nil { - log.Errorf("loadThumb: error closing stored full size: %s", err) - } - }() + defer stored.Close() // stream the file from storage straight into the derive thumbnail function - log.Tracef("loadThumb: calling deriveThumbnail %s", p.attachment.URL) thumb, err := deriveThumbnail(stored, p.attachment.File.ContentType, createBlurhash) if err != nil { p.err = fmt.Errorf("loadThumb: error deriving thumbnail: %s", err) @@ -160,8 +153,12 @@ func (p *ProcessingMedia) loadThumb(ctx context.Context) error { return p.err } + // Close stored media now we're done + if err := stored.Close(); err != nil { + log.Errorf("loadThumb: error closing stored full size: %s", err) + } + // put the thumbnail in storage - log.Tracef("loadThumb: storing new thumbnail %s", p.attachment.URL) if err := p.storage.Put(ctx, p.attachment.Thumbnail.Path, thumb.small); err != nil && err != storage.ErrAlreadyExists { p.err = fmt.Errorf("loadThumb: error storing thumbnail: %s", err) atomic.StoreInt32(&p.thumbState, int32(errored)) |