IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix s3 memory usage (#9373)

Browse Source
This commit is contained in:
Jesse Haka
2018-09-10 20:35:01 +03:00
committed by Carlos Tadeu Panato Junior
parent a8d116b381
commit 4e33aeb581
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/file_backend_s3.go
View File

@@ -4,6 +4,7 @@
package utils
import (
"bytes"
"io"
"io/ioutil"
"net/http"
@@ -182,7 +183,12 @@ func (b *S3FileBackend) WriteFile(fr io.Reader, path string) (int64, *model.AppE
}
options := s3PutOptions(b.encrypt, contentType)
written, err := s3Clnt.PutObject(b.bucket, path, fr, -1, options)
var buf bytes.Buffer
_, err = buf.ReadFrom(fr)
if err != nil {
return 0, model.NewAppError("WriteFile", "api.file.write_file.s3.app_error", nil, err.Error(), http.StatusInternalServerError)
}
written, err := s3Clnt.PutObject(b.bucket, path, &buf, int64(buf.Len()), options)
if err != nil {
return written, model.NewAppError("WriteFile", "api.file.write_file.s3.app_error", nil, err.Error(), http.StatusInternalServerError)
}