kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Remove job from pause/unpause

Browse source 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
This commit is contained in:
Antonio Murdaca 2015-04-09 22:50:48 +02:00
parent 6fb8bd0450
commit 5ccb1c764b
3 changed files with 24 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
api/server/server.go
View file

@ -214,11 +214,21 @@ func postContainersPause(eng *engine.Engine, version version.Version, w http.Res
if err := parseForm(r); err != nil { if err := parseForm(r); err != nil {
return err 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 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) w.WriteHeader(http.StatusNoContent)
return nil return nil
} }
@ -229,11 +239,21 @@ func postContainersUnpause(eng *engine.Engine, version version.Version, w http.R
if err := parseForm(r); err != nil { if err := parseForm(r); err != nil {
return err 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 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) w.WriteHeader(http.StatusNoContent)
return nil return nil
} }

2
daemon/daemon.go
View file

@ -125,13 +125,11 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
"info": daemon.CmdInfo, "info": daemon.CmdInfo,
"kill": daemon.ContainerKill, "kill": daemon.ContainerKill,
"logs": daemon.ContainerLogs, "logs": daemon.ContainerLogs,
"pause": daemon.ContainerPause,
"resize": daemon.ContainerResize, "resize": daemon.ContainerResize,
"restart": daemon.ContainerRestart, "restart": daemon.ContainerRestart,
"start": daemon.ContainerStart, "start": daemon.ContainerStart,
"stop": daemon.ContainerStop, "stop": daemon.ContainerStop,
"top": daemon.ContainerTop, "top": daemon.ContainerTop,
"unpause": daemon.ContainerUnpause,
"wait": daemon.ContainerWait, "wait": daemon.ContainerWait,
"execCreate": daemon.ContainerExecCreate, "execCreate": daemon.ContainerExecCreate,
"execStart": daemon.ContainerExecStart, "execStart": daemon.ContainerExecStart,

39
daemon/pause.go
View file

@ -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
}