From fee80945ccc46b6f38c07f19d1f8abb5ed1a691e Mon Sep 17 00:00:00 2001 From: allencloud Date: Fri, 10 Feb 2017 17:16:34 +0800 Subject: [PATCH] remove redundant code and better error msg Signed-off-by: allencloud Upstream-commit: 5c0ea56d56065ee737557650fa797a61f52e8378 Component: engine --- components/engine/client/swarm_unlock.go | 4 ---- components/engine/client/volume_prune.go | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/components/engine/client/swarm_unlock.go b/components/engine/client/swarm_unlock.go index addfb59f0a..502c6b8407 100644 --- a/components/engine/client/swarm_unlock.go +++ b/components/engine/client/swarm_unlock.go @@ -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 } diff --git a/components/engine/client/volume_prune.go b/components/engine/client/volume_prune.go index a07e4ce637..53a31ee39b 100644 --- a/components/engine/client/volume_prune.go +++ b/components/engine/client/volume_prune.go @@ -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