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>
10 lines
361 B
Go
10 lines
361 B
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import "context"
|
|
|
|
// ServiceRemove kills and removes a service.
|
|
func (cli *Client) ServiceRemove(ctx context.Context, serviceID string) error {
|
|
resp, err := cli.delete(ctx, "/services/"+serviceID, nil, nil)
|
|
defer ensureReaderClosed(resp)
|
|
return wrapResponseError(err, resp, "service", serviceID)
|
|
}
|