From 3d8acd4ee101066a9dee94fb3cc561249563cae5 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Wed, 4 Jan 2017 16:34:37 -0500 Subject: Fixing minio not closing read object (#4971) --- api/file.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'api/file.go') diff --git a/api/file.go b/api/file.go index ede04e2d8..0774a78b8 100644 --- a/api/file.go +++ b/api/file.go @@ -833,11 +833,12 @@ func ReadFile(path string) ([]byte, *model.AppError) { return nil, model.NewLocAppError("ReadFile", "api.file.read_file.s3.app_error", nil, err.Error()) } bucket := utils.Cfg.FileSettings.AmazonS3Bucket - reader, err := s3Clnt.GetObject(bucket, path) + minioObject, err := s3Clnt.GetObject(bucket, path) + defer minioObject.Close() if err != nil { return nil, model.NewLocAppError("ReadFile", "api.file.read_file.s3.app_error", nil, err.Error()) } - if f, err := ioutil.ReadAll(reader); err != nil { + if f, err := ioutil.ReadAll(minioObject); err != nil { return nil, model.NewLocAppError("ReadFile", "api.file.read_file.s3.app_error", nil, err.Error()) } else { return f, nil -- cgit v1.2.3-1-g7c22