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

lease: fix govet errors

release-3.4
Manjunath A Kumatagi 2018-01-25 04:51:13 -05:00
parent 97817404c9
commit f705c1be9b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lease/leasehttp/http.go
View File

@ -62,7 +62,7 @@ func (h *leaseHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
switch r.URL.Path {
case LeasePrefix:
lreq := pb.LeaseKeepAliveRequest{}
if err := lreq.Unmarshal(b); err != nil {
if uerr := lreq.Unmarshal(b); uerr != nil {
http.Error(w, "error unmarshalling request", http.StatusBadRequest)
return
}
@ -72,14 +72,14 @@ func (h *leaseHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
http.Error(w, ErrLeaseHTTPTimeout.Error(), http.StatusRequestTimeout)
return
}
ttl, err := h.l.Renew(lease.LeaseID(lreq.ID))
if err != nil {
if err == lease.ErrLeaseNotFound {
http.Error(w, err.Error(), http.StatusNotFound)
ttl, rerr := h.l.Renew(lease.LeaseID(lreq.ID))
if rerr != nil {
if rerr == lease.ErrLeaseNotFound {
http.Error(w, rerr.Error(), http.StatusNotFound)
return
}
http.Error(w, err.Error(), http.StatusBadRequest)
http.Error(w, rerr.Error(), http.StatusBadRequest)
return
}
// TODO: fill out ResponseHeader
@ -92,7 +92,7 @@ func (h *leaseHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
case LeaseInternalPrefix:
lreq := leasepb.LeaseInternalRequest{}
if err := lreq.Unmarshal(b); err != nil {
if lerr := lreq.Unmarshal(b); lerr != nil {
http.Error(w, "error unmarshalling request", http.StatusBadRequest)
return
}