fcrozat/distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring cloudfactory layer handler into a more generic storage

Browse Source 
middleware concept.

This also breaks the dependency the storage package had on goamz
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
This commit is contained in:
David Lawrence
2015-03-03 08:57:52 -08:00
parent 0c130dff5b
commit 4acda57e05
12 changed files with 160 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
registry/handlers/layer.go
View File

@@ -49,8 +49,8 @@ type layerHandler struct {
// response.
func (lh *layerHandler) GetLayer(w http.ResponseWriter, r *http.Request) {
ctxu.GetLogger(lh).Debug("GetImageLayer")
layers := lh.Repository.Layers()
layer, err := layers.Fetch(lh.Digest)
layerStore := lh.Repository.Layers()
layerReader, err := layerStore.Fetch(lh.Digest)
if err != nil {
switch err := err.(type) {
@@ -62,17 +62,6 @@ func (lh *layerHandler) GetLayer(w http.ResponseWriter, r *http.Request) {
}
return
}
defer layer.Close()
w.Header().Set("Docker-Content-Digest", lh.Digest.String())
if lh.layerHandler != nil {
handler, _ := lh.layerHandler.Resolve(layer)
if handler != nil {
handler.ServeHTTP(w, r)
return
}
}
http.ServeContent(w, r, layer.Digest().String(), layer.CreatedAt(), layer)
layerReader.ServeHTTP(w, r)
}