toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant return nil

Browse Source 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 9788822421255a0516a0e3ce2ac32b1ec9d7d894
Component: engine
This commit is contained in:
yuexiao-wang
2017-01-06 22:18:10 +08:00
parent 47410763de
commit 434810fce9
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/cluster/cluster.go
+6 -12
View File
@@ -1072,10 +1072,8 @@ func (c *Cluster) RemoveService(input string) error {
return err
}
if _, err := state.controlClient.RemoveService(ctx, &swarmapi.RemoveServiceRequest{ServiceID: service.ID}); err != nil {
return err
}
return nil
_, err = state.controlClient.RemoveService(ctx, &swarmapi.RemoveServiceRequest{ServiceID: service.ID})
return err
}
// ServiceLogs collects service logs and writes them back to `config.OutStream`
@@ -1268,10 +1266,8 @@ func (c *Cluster) RemoveNode(input string, force bool) error {
return err
}
if _, err := state.controlClient.RemoveNode(ctx, &swarmapi.RemoveNodeRequest{NodeID: node.ID, Force: force}); err != nil {
return err
}
return nil
_, err = state.controlClient.RemoveNode(ctx, &swarmapi.RemoveNodeRequest{NodeID: node.ID, Force: force})
return err
}
// GetTasks returns a list of tasks matching the filter options.
@@ -1594,10 +1590,8 @@ func (c *Cluster) RemoveNetwork(input string) error {
return err
}
if _, err := state.controlClient.RemoveNetwork(ctx, &swarmapi.RemoveNetworkRequest{NetworkID: network.ID}); err != nil {
return err
}
return nil
_, err = state.controlClient.RemoveNetwork(ctx, &swarmapi.RemoveNetworkRequest{NetworkID: network.ID})
return err
}
func (c *Cluster) populateNetworkID(ctx context.Context, client swarmapi.ControlClient, s *types.ServiceSpec) error {