diff options
author | 2022-11-11 11:01:53 +0000 | |
---|---|---|
committer | 2022-11-11 12:01:53 +0100 | |
commit | 3ce0e33f99ad127e9ce6bb3d0ba5fdf034999fb7 (patch) | |
tree | 8de21fe2a1e682f7a8c7e6577d2af49930f502bd /internal/media/processingemoji.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/processingemoji.go')
-rw-r--r-- | internal/media/processingemoji.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/internal/media/processingemoji.go b/internal/media/processingemoji.go index 32eac4172..ec46ae76d 100644 --- a/internal/media/processingemoji.go +++ b/internal/media/processingemoji.go @@ -148,12 +148,7 @@ func (p *ProcessingEmoji) loadStatic(ctx context.Context) error { atomic.StoreInt32(&p.staticState, int32(errored)) return p.err } - - defer func() { - if err := stored.Close(); err != nil { - log.Errorf("loadStatic: error closing stored full size: %s", err) - } - }() + defer stored.Close() // we haven't processed a static version of this emoji yet so do it now static, err := deriveStaticEmoji(stored, p.emoji.ImageContentType) @@ -163,7 +158,12 @@ func (p *ProcessingEmoji) loadStatic(ctx context.Context) error { return p.err } - // put the static in storage + // Close stored emoji now we're done + if err := stored.Close(); err != nil { + log.Errorf("loadStatic: error closing stored full size: %s", err) + } + + // put the static image in storage if err := p.storage.Put(ctx, p.emoji.ImageStaticPath, static.small); err != nil && err != storage.ErrAlreadyExists { p.err = fmt.Errorf("loadStatic: error storing static: %s", err) atomic.StoreInt32(&p.staticState, int32(errored)) |