Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-25 08:19:40 +02:00
Code Issues Releases Activity

feat(api): replace all calls to http.Error with custom Error writer

Browse source
This commit is contained in:
Anthony Lapenna 2017-01-24 16:35:48 +13:00
parent 1a868be6ea
commit d03e992b4f
4 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
api/http/docker_handler.go
View file

@ -135,7 +135,7 @@ type unixSocketHandler struct {
func (h *unixSocketHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
conn, err := net.Dial("unix", h.path)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
Error(w, err, http.StatusInternalServerError, nil)
return
}
c := httputil.NewClientConn(conn, nil)
@ -143,7 +143,7 @@ func (h *unixSocketHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
res, err := c.Do(r)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
Error(w, err, http.StatusInternalServerError, nil)
return
}
defer res.Body.Close()
@ -154,6 +154,6 @@ func (h *unixSocketHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
}
if _, err := io.Copy(w, res.Body); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
Error(w, err, http.StatusInternalServerError, nil)
}
}