diff options
| author | Chris <ccbrown112@gmail.com> | 2017-11-03 10:25:38 -0500 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2017-11-03 08:25:38 -0700 |
| commit | d5dbdb273703a3add0f1c3287aa531854ab30269 (patch) | |
| tree | 6b1fb9079f9fae9d25bdb7ea459261383ee720d6 /utils/file.go | |
| parent | 9d32cd42085bbb37460d815c6c1a00ad881c4895 (diff) | |
| download | chat-d5dbdb273703a3add0f1c3287aa531854ab30269.tar.gz chat-d5dbdb273703a3add0f1c3287aa531854ab30269.tar.bz2 chat-d5dbdb273703a3add0f1c3287aa531854ab30269.zip | |
several one-line panic, race, and logic fixes (#7766)
Diffstat (limited to 'utils/file.go')
| -rw-r--r-- | utils/file.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/file.go b/utils/file.go index bc97252ae..c7e092a20 100644 --- a/utils/file.go +++ b/utils/file.go @@ -104,10 +104,10 @@ func ReadFile(path string) ([]byte, *model.AppError) { } bucket := Cfg.FileSettings.AmazonS3Bucket minioObject, err := s3Clnt.GetObject(bucket, path) - defer minioObject.Close() if err != nil { return nil, model.NewAppError("ReadFile", "api.file.read_file.s3.app_error", nil, err.Error(), http.StatusInternalServerError) } + defer minioObject.Close() if f, err := ioutil.ReadAll(minioObject); err != nil { return nil, model.NewAppError("ReadFile", "api.file.read_file.s3.app_error", nil, err.Error(), http.StatusInternalServerError) } else { |