From f705c1be9b05e1800a36dedd57c3a1343a366720 Mon Sep 17 00:00:00 2001 From: Manjunath A Kumatagi Date: Thu, 25 Jan 2018 04:51:13 -0500 Subject: [PATCH] lease: fix govet errors --- lease/leasehttp/http.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lease/leasehttp/http.go b/lease/leasehttp/http.go index ac2e7880e..aa713f28e 100644 --- a/lease/leasehttp/http.go +++ b/lease/leasehttp/http.go @@ -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 }