Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdserver/etcdhttp: remove error return from parseRequest

Browse Source
This commit is contained in:
Blake Mizerany 2014-08-27 18:23:47 -07:00 committed by Yicheng Qin
parent 05b2d76d54
commit 163b27c759
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etcdserver2/etcdhttp/http.go
View File

@ -48,11 +48,7 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
func (h Handler) serveKeys(ctx context.Context, w http.ResponseWriter, r *http.Request) {
rr, err := parseRequest(r)
if err != nil {
http.Error(w, err.Error(), 400)
return
}
rr := parseRequest(r)
resp, err := h.Server.Do(ctx, rr)
if err != nil {
@ -83,7 +79,7 @@ func genId() int64 {
panic("implement me")
}
func parseRequest(r *http.Request) (etcdserver.Request, error) {
func parseRequest(r *http.Request) etcdserver.Request {
q := r.URL.Query()
rr := etcdserver.Request{
Id: genId(),
@ -112,7 +108,7 @@ func parseRequest(r *http.Request) (etcdserver.Request, error) {
rr.Expiration = time.Now().Add(expr).UnixNano()
}
return rr, nil
return rr
}
func parseBool(s string) bool {