MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-21 10:16:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Simplifying error handling in api bucket handlers

Browse Source
This commit is contained in:
Frederick F. Kautz IV
2015-03-30 14:27:32 -07:00
parent 06c329d26b
commit 62c4c997c2
2 changed files with 21 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/api_object_handlers.go
View File

@@ -48,9 +48,7 @@ func (server *minioAPI) getObjectHandler(w http.ResponseWriter, req *http.Reques
case true:
setObjectHeaders(w, metadata)
if _, err := server.driver.GetObject(w, bucket, object); err != nil {
log.Error.Println(err)
// unable to write headers, we've already printed data. Just close the connection.
return
}
case false:
metadata.Size = httpRange.length
@@ -58,11 +56,9 @@ func (server *minioAPI) getObjectHandler(w http.ResponseWriter, req *http.Reques
w.WriteHeader(http.StatusPartialContent)
_, err := server.driver.GetPartialObject(w, bucket, object, httpRange.start, httpRange.length)
if err != nil {
log.Error.Println(err)
// unable to write headers, we've already printed data. Just close the connection.
return
log.Error.Println(err)
}
}
}
case drivers.ObjectNotFound:
@@ -132,6 +128,8 @@ func (server *minioAPI) putObjectHandler(w http.ResponseWriter, req *http.Reques
resources := getBucketResources(req.URL.Query())
if resources.Policy == true && object == "" {
// TODO figure out if we can hand this off to router instead of embedding here.
// hand off request to pubBucketPolicyHandler
server.putBucketPolicyHandler(w, req)
return
}