Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "pkg/client: better error handling propogation."

This commit is contained in:
Brad Fitzpatrick 2014-01-08 18:03:33 +00:00 committed by Gerrit Code Review
parent ebcfb0270e fc3d238478
commit 3237139992
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/client/client.go
View File

@ -237,7 +237,7 @@ func NewFromShareRoot(shareBlobURL string, opts ...ClientOption) (c *Client, tar
c.SetHTTPClient(&http.Client{Transport: c.TransportForConfig(nil)})
req := c.newRequest("GET", shareBlobURL, nil)
res, err := c.doReqGated(req)
res, err := c.expect2XX(req)
if err != nil {
return nil, blob.Ref{}, fmt.Errorf("Error fetching %s: %v", shareBlobURL, err)
}
@ -387,7 +387,7 @@ func (c *Client) GetRecentPermanodes(req *search.RecentRequest) (*search.RecentR
}
url := sr + req.URLSuffix()
hreq := c.newRequest("GET", url)
hres, err := c.doReqGated(hreq)
hres, err := c.expect2XX(hreq)
if err != nil {
return nil, err
}
@ -409,7 +409,7 @@ func (c *Client) GetPermanodesWithAttr(req *search.WithAttrRequest) (*search.Wit
}
url := sr + req.URLSuffix()
hreq := c.newRequest("GET", url)
hres, err := c.doReqGated(hreq)
hres, err := c.expect2XX(hreq)
if err != nil {
return nil, err
}
@ -431,7 +431,7 @@ func (c *Client) Describe(req *search.DescribeRequest) (*search.DescribeResponse
}
url := sr + req.URLSuffix()
hreq := c.newRequest("GET", url)
hres, err := c.doReqGated(hreq)
hres, err := c.expect2XX(hreq)
if err != nil {
return nil, err
}
@ -454,7 +454,7 @@ func (c *Client) Search(req *search.SearchQuery) (*search.SearchResult, error) {
return nil, err
}
hreq := c.newRequest("POST", url, bytes.NewReader(body))
hres, err := c.doReqGated(hreq)
hres, err := c.expect2XX(hreq)
if err != nil {
return nil, err
}
@ -524,7 +524,7 @@ func (c *Client) FileHasContents(f, wholeRef blob.Ref) bool {
return false
}
req := c.newRequest("HEAD", c.downloadHelper+f.String()+"/?verifycontents="+wholeRef.String())
res, err := c.doReqGated(req)
res, err := c.expect2XX(req)
if err != nil {
log.Printf("download helper HEAD error: %v", err)
return false
@ -713,6 +713,19 @@ func (c *Client) releaseHTTPToken() {
<-c.reqGate
}
// expect2XX will doReqGated and promote HTTP response codes outside of
// the 200-299 range to a non-nil error containing the response body.
func (c *Client) expect2XX(req *http.Request) (*http.Response, error) {
res, err := c.doReqGated(req)
if err == nil && (res.StatusCode < 200 || res.StatusCode > 299) {
buf := new(bytes.Buffer)
io.CopyN(buf, res.Body, 1<<20)
res.Body.Close()
return res, fmt.Errorf("client: got status code %d from URL %s; body %s", res.StatusCode, req.URL.String(), buf.String())
}
return res, err
}
func (c *Client) doReqGated(req *http.Request) (*http.Response, error) {
c.requestHTTPToken()
defer c.releaseHTTPToken()