9c846b2fcc
Unlike a plain `net/http/client.Do()`, requests made through client/request use the `sendRequest` function, which parses the server response, and may convert non-transport errors into errors (through `cli.checkResponseErr()`). This means that we cannot assume that no reader was opened if an error is returned. This patch changes various locations where `ensureReaderClosed` was only called in the non-error situation, and uses a `defer` to make sure it's always called. `ensureReaderClosed` itself already checks if the response's body was set, so in situations where the error was due to a transport error, calling `ensureReaderClosed` should be a no-op. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
26 lines
597 B
Go
26 lines
597 B
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/url"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
)
|
|
|
|
// Info returns information about the docker server.
|
|
func (cli *Client) Info(ctx context.Context) (types.Info, error) {
|
|
var info types.Info
|
|
serverResp, err := cli.get(ctx, "/info", url.Values{}, nil)
|
|
defer ensureReaderClosed(serverResp)
|
|
if err != nil {
|
|
return info, err
|
|
}
|
|
|
|
if err := json.NewDecoder(serverResp.body).Decode(&info); err != nil {
|
|
return info, fmt.Errorf("Error reading remote info: %v", err)
|
|
}
|
|
|
|
return info, nil
|
|
}
|