diff --git a/daemon/daemon.go b/daemon/daemon.go index 9bc5a66efd..cc20954d61 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -111,6 +111,9 @@ func (daemon *Daemon) Install(eng *engine.Engine) error { if err := eng.Register("attach", daemon.ContainerAttach); err != nil { return err } + if err := eng.Register("pause", daemon.ContainerPause); err != nil { + return err + } return nil } diff --git a/daemon/pause.go b/daemon/pause.go new file mode 100644 index 0000000000..57f492e293 --- /dev/null +++ b/daemon/pause.go @@ -0,0 +1,21 @@ +package daemon + +import ( + "github.com/docker/docker/engine" +) + +func (daemon *Daemon) ContainerPause(job *engine.Job) engine.Status { + if len(job.Args) != 1 { + return job.Errorf("Usage: %s CONTAINER", job.Name) + } + name := job.Args[0] + container := daemon.Get(name) + if container == nil { + return job.Errorf("No such container: %s", name) + } + if err := container.Pause(); err != nil { + return job.Errorf("Cannot pause container %s: %s", name, err) + } + job.Eng.Job("log", "pause", container.ID, daemon.Repositories().ImageName(container.Image)).Run() + return engine.StatusOK +} diff --git a/server/container.go b/server/container.go index f4ad3cab16..073d68d7ce 100644 --- a/server/container.go +++ b/server/container.go @@ -31,22 +31,6 @@ import ( "github.com/docker/docker/utils" ) -func (srv *Server) ContainerPause(job *engine.Job) engine.Status { - if len(job.Args) != 1 { - return job.Errorf("Usage: %s CONTAINER", job.Name) - } - name := job.Args[0] - container := srv.daemon.Get(name) - if container == nil { - return job.Errorf("No such container: %s", name) - } - if err := container.Pause(); err != nil { - return job.Errorf("Cannot pause container %s: %s", name, err) - } - srv.LogEvent("pause", container.ID, srv.daemon.Repositories().ImageName(container.Image)) - return engine.StatusOK -} - func (srv *Server) ContainerUnpause(job *engine.Job) engine.Status { if n := len(job.Args); n < 1 || n > 2 { return job.Errorf("Usage: %s CONTAINER", job.Name) @@ -798,7 +782,6 @@ func (srv *Server) ContainerLogs(job *engine.Job) engine.Status { return engine.StatusOK } - func (srv *Server) ContainerCopy(job *engine.Job) engine.Status { if len(job.Args) != 2 { return job.Errorf("Usage: %s CONTAINER RESOURCE\n", job.Name) diff --git a/server/init.go b/server/init.go index 961c7064f3..189b9e52f7 100644 --- a/server/init.go +++ b/server/init.go @@ -92,7 +92,6 @@ func InitServer(job *engine.Job) engine.Status { "restart": srv.ContainerRestart, "start": srv.ContainerStart, "kill": srv.ContainerKill, - "pause": srv.ContainerPause, "unpause": srv.ContainerUnpause, "wait": srv.ContainerWait, "tag": srv.ImageTag, // FIXME merge with "image_tag"