diff options
author | 2022-09-19 13:43:22 +0200 | |
---|---|---|
committer | 2022-09-19 12:43:22 +0100 | |
commit | 3777f5c68448992a6ed8230f40713d3b31da0413 (patch) | |
tree | 3b56e932503b2dec6ca613e5d8abcfe074b4dfc2 /internal/media/processingemoji.go | |
parent | [bugfix] Fix domains not being unblockable, log internal server errors from A... (diff) | |
download | gotosocial-3777f5c68448992a6ed8230f40713d3b31da0413.tar.xz |
[bugfix] Server and closer bugfixes (#839)
* defer streaming from storage more forcefully
* shut down Server more gracefully
* use command context as server BaseContext
Diffstat (limited to 'internal/media/processingemoji.go')
-rw-r--r-- | internal/media/processingemoji.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/internal/media/processingemoji.go b/internal/media/processingemoji.go index 121f54ddc..e3ed5ce0a 100644 --- a/internal/media/processingemoji.go +++ b/internal/media/processingemoji.go @@ -121,6 +121,12 @@ func (p *ProcessingEmoji) loadStatic(ctx context.Context) error { return p.err } + defer func() { + if err := stored.Close(); err != nil { + log.Errorf("loadStatic: error closing stored full size: %s", err) + } + }() + // we haven't processed a static version of this emoji yet so do it now static, err := deriveStaticEmoji(stored, p.emoji.ImageContentType) if err != nil { @@ -129,12 +135,6 @@ func (p *ProcessingEmoji) loadStatic(ctx context.Context) error { return p.err } - if err := stored.Close(); err != nil { - p.err = fmt.Errorf("loadStatic: error closing stored full size: %s", err) - atomic.StoreInt32(&p.staticState, int32(errored)) - return p.err - } - // put the static in storage if err := p.storage.Put(ctx, p.emoji.ImageStaticPath, static.small); err != nil { p.err = fmt.Errorf("loadStatic: error storing static: %s", err) |