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

Move "restart" to daemon/restart.go

Browse source 
This is part of an effort to break apart the deprecated server/ package

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
This commit is contained in:
Solomon Hykes 2014-07-31 20:48:23 +00:00 • committed by Tibor Vass
parent 4180b87514
commit bd54a73c42
4 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/daemon.go
View file

@ -132,6 +132,9 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
if err := eng.Register("start", daemon.ContainerStart); err != nil { if err := eng.Register("start", daemon.ContainerStart); err != nil {
return err return err
} }
if err := eng.Register("restart", daemon.ContainerRestart); err != nil {
return err
}
return nil return nil
} }

27
daemon/restart.go Normal file
View file

@ -0,0 +1,27 @@
package daemon
import (
"github.com/docker/docker/engine"
)
func (daemon *Daemon) ContainerRestart(job *engine.Job) engine.Status {
if len(job.Args) != 1 {
return job.Errorf("Usage: %s CONTAINER\n", job.Name)
}
var (
name = job.Args[0]
t = 10
)
if job.EnvExists("t") {
t = job.GetenvInt("t")
}
if container := daemon.Get(name); container != nil {
if err := container.Restart(int(t)); err != nil {
return job.Errorf("Cannot restart container %s: %s\n", name, err)
}
job.Eng.Job("log", "restart", container.ID, daemon.Repositories().ImageName(container.Image)).Run()
} else {
return job.Errorf("No such container: %s\n", name)
}
return engine.StatusOK
}

22
server/container.go
View file

@ -261,28 +261,6 @@ func (srv *Server) ContainerCommit(job *engine.Job) engine.Status {
return engine.StatusOK return engine.StatusOK
} }
func (srv *Server) ContainerRestart(job *engine.Job) engine.Status {
if len(job.Args) != 1 {
return job.Errorf("Usage: %s CONTAINER\n", job.Name)
}
var (
name = job.Args[0]
t = 10
)
if job.EnvExists("t") {
t = job.GetenvInt("t")
}
if container := srv.daemon.Get(name); container != nil {
if err := container.Restart(int(t)); err != nil {
return job.Errorf("Cannot restart container %s: %s\n", name, err)
}
srv.LogEvent("restart", container.ID, srv.daemon.Repositories().ImageName(container.Image))
} else {
return job.Errorf("No such container: %s\n", name)
}
return engine.StatusOK
}
func (srv *Server) ContainerDestroy(job *engine.Job) engine.Status { func (srv *Server) ContainerDestroy(job *engine.Job) engine.Status {
if len(job.Args) != 1 { if len(job.Args) != 1 {
return job.Errorf("Not enough arguments. Usage: %s CONTAINER\n", job.Name) return job.Errorf("Not enough arguments. Usage: %s CONTAINER\n", job.Name)

1
server/init.go
View file

@ -86,7 +86,6 @@ func InitServer(job *engine.Job) engine.Status {
job.Eng.Hack_SetGlobalVar("httpapi.daemon", srv.daemon) job.Eng.Hack_SetGlobalVar("httpapi.daemon", srv.daemon)
for name, handler := range map[string]engine.Handler{ for name, handler := range map[string]engine.Handler{
"restart": srv.ContainerRestart,
"wait": srv.ContainerWait, "wait": srv.ContainerWait,
"tag": srv.ImageTag, // FIXME merge with "image_tag" "tag": srv.ImageTag, // FIXME merge with "image_tag"
"resize": srv.ContainerResize, "resize": srv.ContainerResize,