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

add writeJson

This commit is contained in:
Victor Vieux 2013-05-10 21:11:59 +02:00 committed by Guillaume J. Charmes
parent 7cc082347f
commit f7beba3acc
1 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
api.go
View File

@ -39,6 +39,11 @@ func httpError(w http.ResponseWriter, err error) {
} }
} }
func writeJson(w http.ResponseWriter, b []byte) {
w.Header().Set("Content-Type", "application/json")
w.Write(b)
}
func getAuth(srv *Server, w http.ResponseWriter, r *http.Request, vars map[string]string) error { func getAuth(srv *Server, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
config := &auth.AuthConfig{ config := &auth.AuthConfig{
Username: srv.runtime.authConfig.Username, Username: srv.runtime.authConfig.Username,
@ -48,8 +53,7 @@ func getAuth(srv *Server, w http.ResponseWriter, r *http.Request, vars map[strin
if err != nil { if err != nil {
return err return err
} }
w.Header().Set("Content-Type", "application/json") writeJson(w, b)
w.Write(b)
return nil return nil
} }
@ -76,8 +80,7 @@ func postAuth(srv *Server, w http.ResponseWriter, r *http.Request, vars map[stri
if err != nil { if err != nil {
return err return err
} }
w.Header().Set("Content-Type", "application/json") writeJson(w, b)
w.Write(b)
return nil return nil
} }
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
@ -90,8 +93,7 @@ func getVersion(srv *Server, w http.ResponseWriter, r *http.Request, vars map[st
if err != nil { if err != nil {
return err return err
} }
w.Header().Set("Content-Type", "application/json") writeJson(w, b)
w.Write(b)
return nil return nil
} }
@ -137,8 +139,7 @@ func getImagesJson(srv *Server, w http.ResponseWriter, r *http.Request, vars map
if err != nil { if err != nil {
return err return err
} }
w.Header().Set("Content-Type", "application/json") writeJson(w, b)
w.Write(b)
return nil return nil
} }
@ -155,8 +156,7 @@ func getInfo(srv *Server, w http.ResponseWriter, r *http.Request, vars map[strin
if err != nil { if err != nil {
return err return err
} }
w.Header().Set("Content-Type", "application/json") writeJson(w, b)
w.Write(b)
return nil return nil
} }
@ -173,8 +173,7 @@ func getImagesHistory(srv *Server, w http.ResponseWriter, r *http.Request, vars
if err != nil { if err != nil {
return err return err
} }
w.Header().Set("Content-Type", "application/json") writeJson(w, b)
w.Write(b)
return nil return nil
} }
@ -191,8 +190,7 @@ func getContainersChanges(srv *Server, w http.ResponseWriter, r *http.Request, v
if err != nil { if err != nil {
return err return err
} }
w.Header().Set("Content-Type", "application/json") writeJson(w, b)
w.Write(b)
return nil return nil
} }
@ -215,8 +213,7 @@ func getContainersPs(srv *Server, w http.ResponseWriter, r *http.Request, vars m
if err != nil { if err != nil {
return err return err
} }
w.Header().Set("Content-Type", "application/json") writeJson(w, b)
w.Write(b)
return nil return nil
} }
@ -261,8 +258,7 @@ func postCommit(srv *Server, w http.ResponseWriter, r *http.Request, vars map[st
return err return err
} }
w.WriteHeader(http.StatusCreated) w.WriteHeader(http.StatusCreated)
w.Header().Set("Content-Type", "application/json") writeJson(w, b)
w.Write(b)
return nil return nil
} }
@ -310,8 +306,7 @@ func getImagesSearch(srv *Server, w http.ResponseWriter, r *http.Request, vars m
if err != nil { if err != nil {
return err return err
} }
w.Header().Set("Content-Type", "application/json") writeJson(w, b)
w.Write(b)
return nil return nil
} }
@ -402,8 +397,7 @@ func postContainersCreate(srv *Server, w http.ResponseWriter, r *http.Request, v
return err return err
} }
w.WriteHeader(http.StatusCreated) w.WriteHeader(http.StatusCreated)
w.Header().Set("Content-Type", "application/json") writeJson(w, b)
w.Write(b)
return nil return nil
} }
@ -501,8 +495,7 @@ func postContainersWait(srv *Server, w http.ResponseWriter, r *http.Request, var
if err != nil { if err != nil {
return err return err
} }
w.Header().Set("Content-Type", "application/json") writeJson(w, b)
w.Write(b)
return nil return nil
} }
@ -547,8 +540,7 @@ func getContainersByName(srv *Server, w http.ResponseWriter, r *http.Request, va
if err != nil { if err != nil {
return err return err
} }
w.Header().Set("Content-Type", "application/json") writeJson(w, b)
w.Write(b)
return nil return nil
} }
@ -566,8 +558,7 @@ func getImagesByName(srv *Server, w http.ResponseWriter, r *http.Request, vars m
if err != nil { if err != nil {
return err return err
} }
w.Header().Set("Content-Type", "application/json") writeJson(w, b)
w.Write(b)
return nil return nil
} }