1. docker
  2. Commit 63bd4ad9d6d0c55691ff33cbfd24684ef91649e4
Browse code

Move "unpause" to daemon/pause.go

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)

Solomon Hykes authored on 2014/07/30 18:35:39
Showing 4 changed files
daemon/daemon.go
History View file @ 63bd4ad
... ... 
@@ -114,6 +114,9 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
114 114 
 	if err := eng.Register("pause", daemon.ContainerPause); err != nil {
115 115 
 		return err
116 116 
 	}
117 
+	if err := eng.Register("unpause", daemon.ContainerUnpause); err != nil {
118 
+		return err
119 
+	}
117 120 
 	return nil
118 121 
 }
119 122
daemon/pause.go
History View file @ 63bd4ad
... ... 
@@ -19,3 +19,19 @@ func (daemon *Daemon) ContainerPause(job *engine.Job) engine.Status {
19 19 
 	job.Eng.Job("log", "pause", container.ID, daemon.Repositories().ImageName(container.Image)).Run()
20 20 
 	return engine.StatusOK
21 21 
 }
22 
+
23 
+func (daemon *Daemon) ContainerUnpause(job *engine.Job) engine.Status {
24 
+	if n := len(job.Args); n < 1 || n > 2 {
25 
+		return job.Errorf("Usage: %s CONTAINER", job.Name)
26 
+	}
27 
+	name := job.Args[0]
28 
+	container := daemon.Get(name)
29 
+	if container == nil {
30 
+		return job.Errorf("No such container: %s", name)
31 
+	}
32 
+	if err := container.Unpause(); err != nil {
33 
+		return job.Errorf("Cannot unpause container %s: %s", name, err)
34 
+	}
35 
+	job.Eng.Job("log", "unpause", container.ID, daemon.Repositories().ImageName(container.Image)).Run()
36 
+	return engine.StatusOK
37 
+}
server/container.go
History View file @ 63bd4ad
... ... 
@@ -31,22 +31,6 @@ import (
31 31 
 	"github.com/docker/docker/utils"
32 32 
 )
33 33
34 
-func (srv *Server) ContainerUnpause(job *engine.Job) engine.Status {
35 
-	if n := len(job.Args); n < 1 || n > 2 {
36 
-		return job.Errorf("Usage: %s CONTAINER", job.Name)
37 
-	}
38 
-	name := job.Args[0]
39 
-	container := srv.daemon.Get(name)
40 
-	if container == nil {
41 
-		return job.Errorf("No such container: %s", name)
42 
-	}
43 
-	if err := container.Unpause(); err != nil {
44 
-		return job.Errorf("Cannot unpause container %s: %s", name, err)
45 
-	}
46 
-	srv.LogEvent("unpause", container.ID, srv.daemon.Repositories().ImageName(container.Image))
47 
-	return engine.StatusOK
48 
-}
49 
-
50 34 
 // ContainerKill send signal to the container
51 35 
 // If no signal is given (sig 0), then Kill with SIGKILL and wait
52 36 
 // for the container to exit.
server/init.go
History View file @ 63bd4ad
... ... 
@@ -92,7 +92,6 @@ func InitServer(job *engine.Job) engine.Status {
92 92 
 		"restart":          srv.ContainerRestart,
93 93 
 		"start":            srv.ContainerStart,
94 94 
 		"kill":             srv.ContainerKill,
95 
-		"unpause":          srv.ContainerUnpause,
96 95 
 		"wait":             srv.ContainerWait,
97 96 
 		"tag":              srv.ImageTag, // FIXME merge with "image_tag"
98 97 
 		"resize":           srv.ContainerResize,