|
@@ -62,7 +62,7 @@ func (h *leaseHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
switch r.URL.Path {
|
|
switch r.URL.Path {
|
|
|
case LeasePrefix:
|
|
case LeasePrefix:
|
|
|
lreq := pb.LeaseKeepAliveRequest{}
|
|
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)
|
|
http.Error(w, "error unmarshalling request", http.StatusBadRequest)
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
@@ -72,14 +72,14 @@ func (h *leaseHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
http.Error(w, ErrLeaseHTTPTimeout.Error(), http.StatusRequestTimeout)
|
|
http.Error(w, ErrLeaseHTTPTimeout.Error(), http.StatusRequestTimeout)
|
|
|
return
|
|
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
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- http.Error(w, err.Error(), http.StatusBadRequest)
|
|
|
|
|
|
|
+ http.Error(w, rerr.Error(), http.StatusBadRequest)
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
// TODO: fill out ResponseHeader
|
|
// TODO: fill out ResponseHeader
|
|
@@ -92,7 +92,7 @@ func (h *leaseHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
|
|
|
case LeaseInternalPrefix:
|
|
case LeaseInternalPrefix:
|
|
|
lreq := leasepb.LeaseInternalRequest{}
|
|
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)
|
|
http.Error(w, "error unmarshalling request", http.StatusBadRequest)
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|