vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1545 from unihorn/197 

etcdhttp: always respond json-format error to client
release-2.0
Yicheng Qin 2014-11-03 23:25:14 -08:00
parent 5ead800ff5 9aefb91531
commit 2235b47030
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdserver/etcdhttp/client_test.go
View File

@ -1124,7 +1124,7 @@ func TestBadServeKeys(t *testing.T) {
},
http.StatusInternalServerError,
"Internal Server Error",
`{"message":"Internal Server Error"}`,
},
{
// etcdserver.Server etcd error
@ -1144,7 +1144,7 @@ func TestBadServeKeys(t *testing.T) {
},
http.StatusInternalServerError,
"Internal Server Error",
`{"message":"Internal Server Error"}`,
},
}
for i, tt := range testBadCases {

3
etcdserver/etcdhttp/http.go
View File

@ -51,7 +51,8 @@ func writeError(w http.ResponseWriter, err error) {
e.WriteTo(w)
default:
log.Printf("etcdhttp: unexpected error: %v", err)
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
herr := httptypes.NewHTTPError(http.StatusInternalServerError, "Internal Server Error")
herr.WriteTo(w)
}
}