clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-04 04:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13547 from coolljt0725/fix_unpause_not_running_container

Browse Source 
Correct the message of pause and unpause a non-running container
This commit is contained in:
Antonio Murdaca
2015-06-15 23:56:32 +02:00
parent 86d6a5b11f 20927ffbe7
commit 835f1c9116
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/container.go
+11 -11
View File
@@ -399,16 +399,16 @@ func (container *Container) Pause() error {
container.Lock()
defer container.Unlock()
// We cannot Pause the container which is not running
if !container.Running {
return fmt.Errorf("Container %s is not running, cannot pause a non-running container", container.ID)
}
// We cannot Pause the container which is already paused
if container.Paused {
return fmt.Errorf("Container %s is already paused", container.ID)
}
// We cannot Pause the container which is not running
if !container.Running {
return fmt.Errorf("Container %s is not running", container.ID)
}
if err := container.daemon.execDriver.Pause(container.command); err != nil {
return err
}
@@ -421,14 +421,14 @@ func (container *Container) Unpause() error {
container.Lock()
defer container.Unlock()
// We cannot unpause the container which is not paused
if !container.Paused {
return fmt.Errorf("Container %s is not paused, so what", container.ID)
}
// We cannot unpause the container which is not running
if !container.Running {
return fmt.Errorf("Container %s is not running", container.ID)
return fmt.Errorf("Container %s is not running, cannot unpause a non-running container", container.ID)
}
// We cannot unpause the container which is not paused
if !container.Paused {
return fmt.Errorf("Container %s is not paused", container.ID)
}
if err := container.daemon.execDriver.Unpause(container.command); err != nil {