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

Remove redundant error message

Browse Source 
Currently some commands including `kill`, `pause`, `restart`, `rm`,
`rmi`, `stop`, `unpause`, `udpate`, `wait` will print a lot of error
message on client side, with a lot of redundant messages, this commit is
trying to remove the unuseful and redundant information for user.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 894266c1bbdfeb53bf278f3cb762945bac69e592
Component: engine
This commit is contained in:
Zhang Wei
2016-02-03 14:29:15 +08:00
parent 2a82c3d7ca
commit 68f96de053
17 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/daemon/pause.go
View File

@ -13,7 +13,7 @@ func (daemon *Daemon) ContainerPause(name string) error {
}
if err := daemon.containerPause(container); err != nil {
return derr.ErrorCodePauseError.WithArgs(name, err)
return err
}
return nil
@ -36,7 +36,7 @@ func (daemon *Daemon) containerPause(container *container.Container) error {
}
if err := daemon.execDriver.Pause(container.Command); err != nil {
return err
return derr.ErrorCodeCantPause.WithArgs(container.ID, err)
}
container.Paused = true
daemon.LogContainerEvent(container, "pause")