diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-01-04 16:34:37 -0500 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-01-04 16:34:37 -0500 |
| commit | 3d8acd4ee101066a9dee94fb3cc561249563cae5 (patch) | |
| tree | ffeacf8b29843355f70a9d77445a3e757d25c913 /api/file.go | |
| parent | 17968f0392cd0d9b36aa9095367d153dcd40492a (diff) | |
| download | chat-3d8acd4ee101066a9dee94fb3cc561249563cae5.tar.gz chat-3d8acd4ee101066a9dee94fb3cc561249563cae5.tar.bz2 chat-3d8acd4ee101066a9dee94fb3cc561249563cae5.zip | |
Fixing minio not closing read object (#4971)
Diffstat (limited to 'api/file.go')
| -rw-r--r-- | api/file.go | 5 |
1 files changed, 3 insertions, 2 deletions
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 |