From 6ebdc306edd9b1ee0d853bdad63c0fb418382eb7 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Wed, 21 Dec 2022 11:17:43 +0100 Subject: [bugfix] Close reader gracefully when streaming recache of remote media to fileserver api caller (#1281) * close pipereader on failed data function * gently slurp the bytes * readability updates * go fmt * tidy up file server tests + add more cases * start moving io wrappers to separate iotools package. Remove use of buffering while piping recache stream Signed-off-by: kim * add license text Signed-off-by: kim Co-authored-by: kim --- internal/api/client/fileserver/servefile.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'internal/api/client/fileserver/servefile.go') diff --git a/internal/api/client/fileserver/servefile.go b/internal/api/client/fileserver/servefile.go index e4eca770f..d2328a5fc 100644 --- a/internal/api/client/fileserver/servefile.go +++ b/internal/api/client/fileserver/servefile.go @@ -19,7 +19,9 @@ package fileserver import ( + "bytes" "fmt" + "io" "net/http" "strconv" @@ -120,5 +122,14 @@ func (m *FileServer) ServeFile(c *gin.Context) { return } - c.DataFromReader(http.StatusOK, content.ContentLength, format, content.Content, nil) + // try to slurp the first few bytes to make sure we have something + b := bytes.NewBuffer(make([]byte, 0, 64)) + if _, err := io.CopyN(b, content.Content, 64); err != nil { + err = fmt.Errorf("ServeFile: error reading from content: %w", err) + api.ErrorHandler(c, gtserror.NewErrorNotFound(err, err.Error()), m.processor.InstanceGet) + return + } + + // we're good, return the slurped bytes + the rest of the content + c.DataFromReader(http.StatusOK, content.ContentLength, format, io.MultiReader(b, content.Content), nil) } -- cgit v1.2.3