Merge pull request #128 from cybozu-go/fix-leak

[client] always close resp.Body
cybozu-go · Dec 25, 2018 · 9305721 · 9305721
2 parents 4a9afbc + bb57d76
commit 9305721
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client/client.go b/client/client.go
@@ -65,10 +65,10 @@ func (c *Client) do(req *http.Request) (*http.Response, error) {
 	case 200 <= resp.StatusCode && resp.StatusCode < 400:
 	case 400 <= resp.StatusCode && resp.StatusCode < 600:
 		body, err := ioutil.ReadAll(resp.Body)
+		resp.Body.Close()
 		if err != nil {
 			return nil, err
 		}
-		resp.Body.Close()
 
 		var msg map[string]interface{}
 		err = json.Unmarshal(body, &msg)

diff --git a/client/error.go b/client/error.go
@@ -10,7 +10,7 @@ type httpError struct {
 }
 
 func (e *httpError) Error() string {
-	return http.StatusText(e.code)
+	return http.StatusText(e.code) + ": " + e.reason
 }
 
 // Is4xx returns true if err contains 4xx status code