From 8aa9f4eee60e4e58ba29cf6745d2aa5f4d353d6a Mon Sep 17 00:00:00 2001 From: Toshiaki Makita Date: Wed, 2 Sep 2015 16:12:19 -0700 Subject: [PATCH] Don't discard error message on sending response Error messages are always discarded and it makes diagnostic difficult when error occurs. Before: $ dnet network create -d overlay ov1 error : "" $ docker network create -d overlay ov1 Error response from daemon: "" After: $ dnet network create -d overlay ov1 error : "no datastore configured. cannot obtain vxlan id" $ docker network create -d overlay ov1 Error response from daemon: "no datastore configured. cannot obtain vxlan id" Breakage caused by 7b8bb3e Signed-off-by: Toshiaki Makita --- api/api.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/api.go b/api/api.go index 12cefe1..07ebf8b 100644 --- a/api/api.go +++ b/api/api.go @@ -168,6 +168,10 @@ func makeHandler(ctrl libnetwork.NetworkController, fct processor) http.HandlerF } res, rsp := fct(ctrl, mux.Vars(req), body) + if !rsp.isOK() { + http.Error(w, rsp.Status, rsp.StatusCode) + return + } if res != nil { writeJSON(w, rsp.StatusCode, res) }