docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1308 from pdevine/errorstrs 

Add error messages when pulling/loading images
This commit is contained in:
Chanwit Kaewkasi 2015-10-17 07:42:39 +07:00
parent e22431bcb2 fe73803861
commit 894d1abd63
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/handlers.go
View File

@ -491,10 +491,12 @@ func postImagesCreate(c *context, w http.ResponseWriter, r *http.Request) {
image += ":" + tag
}
var errorMessage string
errorFound := false
callback := func(what, status string, err error) {
if err != nil {
errorFound = true
errorMessage = err.Error()
sendJSONMessage(wf, what, fmt.Sprintf("Pulling %s... : %s", image, err.Error()))
return
}
@ -507,7 +509,7 @@ func postImagesCreate(c *context, w http.ResponseWriter, r *http.Request) {
c.cluster.Pull(image, &authConfig, callback)
if errorFound {
sendErrorJSONMessage(wf, 1, "")
sendErrorJSONMessage(wf, 1, errorMessage)
}
} else { //import
@ -515,10 +517,12 @@ func postImagesCreate(c *context, w http.ResponseWriter, r *http.Request) {
repo := r.Form.Get("repo")
tag := r.Form.Get("tag")
var errorMessage string
errorFound := false
callback := func(what, status string, err error) {
if err != nil {
errorFound = true
errorMessage = err.Error()
sendJSONMessage(wf, what, err.Error())
return
}
@ -526,7 +530,7 @@ func postImagesCreate(c *context, w http.ResponseWriter, r *http.Request) {
}
c.cluster.Import(source, repo, tag, r.Body, callback)
if errorFound {
sendErrorJSONMessage(wf, 1, "")
sendErrorJSONMessage(wf, 1, errorMessage)
}
}
@ -539,10 +543,12 @@ func postImagesLoad(c *context, w http.ResponseWriter, r *http.Request) {
// call cluster to load image on every node
wf := NewWriteFlusher(w)
var errorMessage string
errorFound := false
callback := func(what, status string, err error) {
if err != nil {
errorFound = true
errorMessage = err.Error()
sendJSONMessage(wf, what, fmt.Sprintf("Loading Image... : %s", err.Error()))
return
}
@ -555,7 +561,7 @@ func postImagesLoad(c *context, w http.ResponseWriter, r *http.Request) {
}
c.cluster.Load(r.Body, callback)
if errorFound {
sendErrorJSONMessage(wf, 1, "")
sendErrorJSONMessage(wf, 1, errorMessage)
}
}

4
api/utils.go
View File

@ -44,8 +44,10 @@ func sendErrorJSONMessage(w io.Writer, errorCode int, errorMessage string) {
}
message := struct {
Error interface{} `json:"errorDetail,omitempty"`
ErrorMsg string `json:"error,omitempty"`
Error interface{} `json:"errorDetail,omitempty"`
}{
errorMessage,
&error,
}