Browse code

Move "pause" 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:13:53
Showing 4 changed files
... ...
@@ -111,6 +111,9 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
111 111
 	if err := eng.Register("attach", daemon.ContainerAttach); err != nil {
112 112
 		return err
113 113
 	}
114
+	if err := eng.Register("pause", daemon.ContainerPause); err != nil {
115
+		return err
116
+	}
114 117
 	return nil
115 118
 }
116 119
 
117 120
new file mode 100644
... ...
@@ -0,0 +1,21 @@
0
+package daemon
1
+
2
+import (
3
+	"github.com/docker/docker/engine"
4
+)
5
+
6
+func (daemon *Daemon) ContainerPause(job *engine.Job) engine.Status {
7
+	if len(job.Args) != 1 {
8
+		return job.Errorf("Usage: %s CONTAINER", job.Name)
9
+	}
10
+	name := job.Args[0]
11
+	container := daemon.Get(name)
12
+	if container == nil {
13
+		return job.Errorf("No such container: %s", name)
14
+	}
15
+	if err := container.Pause(); err != nil {
16
+		return job.Errorf("Cannot pause container %s: %s", name, err)
17
+	}
18
+	job.Eng.Job("log", "pause", container.ID, daemon.Repositories().ImageName(container.Image)).Run()
19
+	return engine.StatusOK
20
+}
... ...
@@ -31,22 +31,6 @@ import (
31 31
 	"github.com/docker/docker/utils"
32 32
 )
33 33
 
34
-func (srv *Server) ContainerPause(job *engine.Job) engine.Status {
35
-	if len(job.Args) != 1 {
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.Pause(); err != nil {
44
-		return job.Errorf("Cannot pause container %s: %s", name, err)
45
-	}
46
-	srv.LogEvent("pause", container.ID, srv.daemon.Repositories().ImageName(container.Image))
47
-	return engine.StatusOK
48
-}
49
-
50 34
 func (srv *Server) ContainerUnpause(job *engine.Job) engine.Status {
51 35
 	if n := len(job.Args); n < 1 || n > 2 {
52 36
 		return job.Errorf("Usage: %s CONTAINER", job.Name)
... ...
@@ -798,7 +782,6 @@ func (srv *Server) ContainerLogs(job *engine.Job) engine.Status {
798 798
 	return engine.StatusOK
799 799
 }
800 800
 
801
-
802 801
 func (srv *Server) ContainerCopy(job *engine.Job) engine.Status {
803 802
 	if len(job.Args) != 2 {
804 803
 		return job.Errorf("Usage: %s CONTAINER RESOURCE\n", job.Name)
... ...
@@ -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
-		"pause":            srv.ContainerPause,
96 95
 		"unpause":          srv.ContainerUnpause,
97 96
 		"wait":             srv.ContainerWait,
98 97
 		"tag":              srv.ImageTag, // FIXME merge with "image_tag"