github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-21 21:44:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

second excluding of unused transformation

Browse Source 
sorry, could not grep it all before
This commit is contained in:
Igor Dolzhikov
2014-10-27 00:47:54 +06:00
parent 9aa2134521
commit 7e9dcce3cb
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
shared/build/docker/client.go
View File

@@ -214,12 +214,8 @@ func (c *Client) do(method, path string, in, out interface{}) error {
return err
}
// Read the bytes from the body (make sure we defer close the body)
// make sure we defer close the body
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return err
}
// Check for an http error status (ie not 200 StatusOK)
switch resp.StatusCode {
@@ -233,9 +229,9 @@ func (c *Client) do(method, path string, in, out interface{}) error {
return ErrBadRequest
}
// Unmarshall the JSON response
// Decode the JSON response
if out != nil {
return json.Unmarshal(body, out)
return json.NewDecoder(resp.Body).Decode(out)
}
return nil