1. docker
  2. Commit e0fd96f850a65cfa6b386fb6b91ee8ced58f5fc2
Browse code

Move "resize" to daemon/resize.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/08/01 05:53:22
Showing 4 changed files
daemon/daemon.go
History View file @ e0fd96f
... ... 
@@ -138,6 +138,9 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
138 138 
 	if err := eng.Register("wait", daemon.ContainerWait); err != nil {
139 139 
 		return err
140 140 
 	}
141 
+	if err := eng.Register("resize", daemon.ContainerResize); err != nil {
142 
+		return err
143 
+	}
141 144 
 	return nil
142 145 
 }
143 146
daemon/resize.go
History View file @ e0fd96f
144 147 
new file mode 100644
... ... 
@@ -0,0 +1,29 @@
0 
+package daemon
1 
+
2 
+import (
3 
+	"strconv"
4 
+
5 
+	"github.com/docker/docker/engine"
6 
+)
7 
+
8 
+func (daemon *Daemon) ContainerResize(job *engine.Job) engine.Status {
9 
+	if len(job.Args) != 3 {
10 
+		return job.Errorf("Not enough arguments. Usage: %s CONTAINER HEIGHT WIDTH\n", job.Name)
11 
+	}
12 
+	name := job.Args[0]
13 
+	height, err := strconv.Atoi(job.Args[1])
14 
+	if err != nil {
15 
+		return job.Error(err)
16 
+	}
17 
+	width, err := strconv.Atoi(job.Args[2])
18 
+	if err != nil {
19 
+		return job.Error(err)
20 
+	}
21 
+	if container := daemon.Get(name); container != nil {
22 
+		if err := container.Resize(height, width); err != nil {
23 
+			return job.Error(err)
24 
+		}
25 
+		return engine.StatusOK
26 
+	}
27 
+	return job.Errorf("No such container: %s", name)
28 
+}
server/container.go
History View file @ e0fd96f
... ... 
@@ -386,28 +386,6 @@ func (srv *Server) ContainerDestroy(job *engine.Job) engine.Status {
386 386 
 	return engine.StatusOK
387 387 
 }
388 388
389 
-func (srv *Server) ContainerResize(job *engine.Job) engine.Status {
390 
-	if len(job.Args) != 3 {
391 
-		return job.Errorf("Not enough arguments. Usage: %s CONTAINER HEIGHT WIDTH\n", job.Name)
392 
-	}
393 
-	name := job.Args[0]
394 
-	height, err := strconv.Atoi(job.Args[1])
395 
-	if err != nil {
396 
-		return job.Error(err)
397 
-	}
398 
-	width, err := strconv.Atoi(job.Args[2])
399 
-	if err != nil {
400 
-		return job.Error(err)
401 
-	}
402 
-	if container := srv.daemon.Get(name); container != nil {
403 
-		if err := container.Resize(height, width); err != nil {
404 
-			return job.Error(err)
405 
-		}
406 
-		return engine.StatusOK
407 
-	}
408 
-	return job.Errorf("No such container: %s", name)
409 
-}
410 
-
411 389 
 func (srv *Server) ContainerLogs(job *engine.Job) engine.Status {
412 390 
 	if len(job.Args) != 1 {
413 391 
 		return job.Errorf("Usage: %s CONTAINER\n", job.Name)
server/init.go
History View file @ e0fd96f
... ... 
@@ -87,7 +87,6 @@ func InitServer(job *engine.Job) engine.Status {
87 87
88 88 
 	for name, handler := range map[string]engine.Handler{
89 89 
 		"tag":              srv.ImageTag, // FIXME merge with "image_tag"
90 
-		"resize":           srv.ContainerResize,
91 90 
 		"commit":           srv.ContainerCommit,
92 91 
 		"info":             srv.DockerInfo,
93 92 
 		"container_delete": srv.ContainerDestroy,