From bb0e7eb196c65972ea66154461b7e654d776f92a Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Thu, 5 Nov 2015 13:40:42 -0800 Subject: [PATCH] Move errcode handling for resize upper It'll allow to separate daemon layer more cleanly later. Signed-off-by: Alexander Morozov --- daemon/container.go | 3 --- daemon/resize.go | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/daemon/container.go b/daemon/container.go index bc132af2a3..f82c69a56a 100644 --- a/daemon/container.go +++ b/daemon/container.go @@ -244,9 +244,6 @@ func (container *Container) ExitOnNext() { // Resize changes the TTY of the process running inside the container // to the given height and width. The container must be running. func (container *Container) Resize(h, w int) error { - if !container.IsRunning() { - return derr.ErrorCodeNotRunning.WithArgs(container.ID) - } if err := container.command.ProcessConfig.Terminal.Resize(h, w); err != nil { return err } diff --git a/daemon/resize.go b/daemon/resize.go index 7fa5b6652a..ea9928c4dc 100644 --- a/daemon/resize.go +++ b/daemon/resize.go @@ -1,5 +1,7 @@ package daemon +import derr "github.com/docker/docker/errors" + // ContainerResize changes the size of the TTY of the process running // in the container with the given name to the given height and width. func (daemon *Daemon) ContainerResize(name string, height, width int) error { @@ -8,6 +10,10 @@ func (daemon *Daemon) ContainerResize(name string, height, width int) error { return err } + if !container.IsRunning() { + return derr.ErrorCodeNotRunning.WithArgs(container.ID) + } + if err = container.Resize(height, width); err == nil { daemon.LogContainerEvent(container, "resize") }