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

etcdserver/etcdhttp: response with 504

release-2.0
Blake Mizerany 2014-08-27 15:19:52 -07:00 committed by Yicheng Qin
parent 735647e6a3
commit 7638acdf37
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etcdserver2/etcdhttp/http.go
View File

@ -56,7 +56,9 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
panic("TODO")
}
encodeResponse(ctx, w, resp)
if err := encodeResponse(ctx, w, resp); err != nil {
http.Error(w, "Timeout while waiting for response", 504)
}
}
func parseRequest(r *http.Request) (etcdserver.Request, error) {
@ -89,7 +91,10 @@ func encodeResponse(ctx context.Context, w http.ResponseWriter, resp etcdserver.
w.WriteHeader(http.StatusOK)
}
return json.NewEncoder(w).Encode(ev)
if err := json.NewEncoder(w).Encode(ev); err != nil {
panic(err) // should never be reached
}
return nil
}
func canBlock(r etcdserver.Request) bool {