Skip to content

Commit

Permalink
fixed slice for local-meta adapter
Browse files Browse the repository at this point in the history
  • Loading branch information
aldor007 committed Dec 19, 2017
1 parent bc8d3fb commit 8d8909d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions pkg/storage/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -285,17 +285,11 @@ func prepareResponse(obj *object.FileObject, stream io.ReadCloser, item stow.Ite
return response.NewError(500, err)
}

size, err := item.Size()
if err != nil {
log.Log().Warn("Storage/prepareResponse read size error", zap.String("obj.Key", obj.Key), zap.String("obj.Bucket", obj.Bucket), zap.Int("sc", 500), zap.Error(err))
return response.NewError(500, err)
}

if etag != "" {
res.Set("ETag", etag)
}
res.Set("Last-Modified", lastMod.Format(http.TimeFormat))
res.ContentLength = size

if contentType, ok := metadata["Content-Type"]; ok {
res.SetContentType(contentType.(string))
Expand Down

0 comments on commit 8d8909d

Please # to comment.