0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #30905 from allencloud/remove-redudant-code-in-unlock-and-better-error-msg

Browse source 
remove redundant code and better error msg
This commit is contained in:
Akihiro Suda 2017-02-11 20:13:31 +09:00 • committed by GitHub
commit 9a6ebf08e7
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/swarm_unlock.go
View file

@ -8,10 +8,6 @@ import (
// SwarmUnlock unlockes locked swarm.
func (cli *Client) SwarmUnlock(ctx context.Context, req swarm.UnlockRequest) error {
serverResp, err := cli.post(ctx, "/swarm/unlock", nil, req, nil)
if err != nil {
return err
}
ensureReaderClosed(serverResp)
return err
}

2
client/volume_prune.go
View file

@ -29,7 +29,7 @@ func (cli *Client) VolumesPrune(ctx context.Context, pruneFilters filters.Args)
defer ensureReaderClosed(serverResp)
if err := json.NewDecoder(serverResp.body).Decode(&report); err != nil {
return report, fmt.Errorf("Error retrieving disk usage: %v", err)
return report, fmt.Errorf("Error retrieving volume prune report:: %v", err)
}
return report, nil