From 3777f5c68448992a6ed8230f40713d3b31da0413 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Mon, 19 Sep 2022 13:43:22 +0200
Subject: [bugfix] Server and closer bugfixes (#839)

* defer streaming from storage more forcefully

* shut down Server more gracefully

* use command context as server BaseContext
---
 internal/media/processingemoji.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'internal/media/processingemoji.go')

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)
-- 
cgit v1.2.3