docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity

Merge pull request #2171 from allencloud/add-return-when-getting-an-httpError

Browse Source 
return immediately when getting an httpError to avoid response mixture
This commit is contained in:
Nishant Totla
2016-04-26 13:07:20 -07:00
parent 258e9d6752 4d9e8dc42d
commit 5cb4faad2b
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/handlers.go
View File

@@ -1053,6 +1053,7 @@ func proxyContainer(c *context, w http.ResponseWriter, r *http.Request) {
if err != nil {
if container == nil {
httpError(w, err.Error(), http.StatusNotFound)
return
}
httpError(w, err.Error(), http.StatusInternalServerError)
return
@@ -1168,8 +1169,10 @@ func postTagImage(c *context, w http.ResponseWriter, r *http.Request) {
if err := c.cluster.TagImage(name, repo, tag, force); err != nil {
if strings.HasPrefix(err.Error(), "No such image") {
httpError(w, err.Error(), http.StatusNotFound)
return
} else {
httpError(w, err.Error(), http.StatusInternalServerError)
return
}
}
w.WriteHeader(http.StatusCreated)
@@ -1211,6 +1214,7 @@ func postCommit(c *context, w http.ResponseWriter, r *http.Request) {
if err != nil {
if container == nil {
httpError(w, err.Error(), http.StatusNotFound)
return
}
httpError(w, err.Error(), http.StatusInternalServerError)
return
@@ -1301,6 +1305,7 @@ func postRenameContainer(c *context, w http.ResponseWriter, r *http.Request) {
if err != nil {
if container == nil {
httpError(w, err.Error(), http.StatusNotFound)
return
}
httpError(w, err.Error(), http.StatusInternalServerError)
return
@@ -1314,8 +1319,10 @@ func postRenameContainer(c *context, w http.ResponseWriter, r *http.Request) {
if err = c.cluster.RenameContainer(container, r.Form.Get("name")); err != nil {
if strings.HasPrefix(err.Error(), "Conflict") {
httpError(w, err.Error(), http.StatusConflict)
return
} else {
httpError(w, err.Error(), http.StatusInternalServerError)
return
}
}
w.WriteHeader(http.StatusNoContent)
@@ -1328,6 +1335,7 @@ func proxyHijack(c *context, w http.ResponseWriter, r *http.Request) {
if err != nil {
if container == nil {
httpError(w, err.Error(), http.StatusNotFound)
return
}
httpError(w, err.Error(), http.StatusInternalServerError)
return