diff --git a/api/server/server.go b/api/server/server.go index d8b40f02fa..76f0147bb1 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -214,11 +214,21 @@ func postContainersPause(eng *engine.Engine, version version.Version, w http.Res if err := parseForm(r); err != nil { return err } - job := eng.Job("pause", vars["name"]) - if err := job.Run(); err != nil { + + name := vars["name"] + d := getDaemon(eng) + cont, err := d.Get(name) + if err != nil { return err } + + if err := cont.Pause(); err != nil { + return fmt.Errorf("Cannot pause container %s: %s", name, err) + } + cont.LogEvent("pause") + w.WriteHeader(http.StatusNoContent) + return nil } @@ -229,11 +239,21 @@ func postContainersUnpause(eng *engine.Engine, version version.Version, w http.R if err := parseForm(r); err != nil { return err } - job := eng.Job("unpause", vars["name"]) - if err := job.Run(); err != nil { + + name := vars["name"] + d := getDaemon(eng) + cont, err := d.Get(name) + if err != nil { return err } + + if err := cont.Unpause(); err != nil { + return fmt.Errorf("Cannot unpause container %s: %s", name, err) + } + cont.LogEvent("unpause") + w.WriteHeader(http.StatusNoContent) + return nil } diff --git a/daemon/daemon.go b/daemon/daemon.go index c9b5285f0a..89083093b5 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -125,13 +125,11 @@ func (daemon *Daemon) Install(eng *engine.Engine) error { "info": daemon.CmdInfo, "kill": daemon.ContainerKill, "logs": daemon.ContainerLogs, - "pause": daemon.ContainerPause, "resize": daemon.ContainerResize, "restart": daemon.ContainerRestart, "start": daemon.ContainerStart, "stop": daemon.ContainerStop, "top": daemon.ContainerTop, - "unpause": daemon.ContainerUnpause, "wait": daemon.ContainerWait, "execCreate": daemon.ContainerExecCreate, "execStart": daemon.ContainerExecStart, diff --git a/daemon/pause.go b/daemon/pause.go deleted file mode 100644 index 448c521e41..0000000000 --- a/daemon/pause.go +++ /dev/null @@ -1,39 +0,0 @@ -package daemon - -import ( - "fmt" - - "github.com/docker/docker/engine" -) - -func (daemon *Daemon) ContainerPause(job *engine.Job) error { - if len(job.Args) != 1 { - return fmt.Errorf("Usage: %s CONTAINER", job.Name) - } - name := job.Args[0] - container, err := daemon.Get(name) - if err != nil { - return err - } - if err := container.Pause(); err != nil { - return fmt.Errorf("Cannot pause container %s: %s", name, err) - } - container.LogEvent("pause") - return nil -} - -func (daemon *Daemon) ContainerUnpause(job *engine.Job) error { - if n := len(job.Args); n < 1 || n > 2 { - return fmt.Errorf("Usage: %s CONTAINER", job.Name) - } - name := job.Args[0] - container, err := daemon.Get(name) - if err != nil { - return err - } - if err := container.Unpause(); err != nil { - return fmt.Errorf("Cannot unpause container %s: %s", name, err) - } - container.LogEvent("unpause") - return nil -}