Browse code

Remove job from resize&execResize

Signed-off-by: Antonio Murdaca <me@runcom.ninja>

Antonio Murdaca authored on 2015/04/10 06:51:22
Showing 3 changed files
... ...
@@ -1005,9 +1005,26 @@ func postContainersResize(eng *engine.Engine, version version.Version, w http.Re
1005 1005
 	if vars == nil {
1006 1006
 		return fmt.Errorf("Missing parameter")
1007 1007
 	}
1008
-	if err := eng.Job("resize", vars["name"], r.Form.Get("h"), r.Form.Get("w")).Run(); err != nil {
1008
+
1009
+	height, err := strconv.Atoi(r.Form.Get("h"))
1010
+	if err != nil {
1011
+		return nil
1012
+	}
1013
+	width, err := strconv.Atoi(r.Form.Get("w"))
1014
+	if err != nil {
1015
+		return nil
1016
+	}
1017
+
1018
+	d := getDaemon(eng)
1019
+	cont, err := d.Get(vars["name"])
1020
+	if err != nil {
1009 1021
 		return err
1010 1022
 	}
1023
+
1024
+	if err := cont.Resize(height, width); err != nil {
1025
+		return err
1026
+	}
1027
+
1011 1028
 	return nil
1012 1029
 }
1013 1030
 
... ...
@@ -1363,9 +1380,21 @@ func postContainerExecResize(eng *engine.Engine, version version.Version, w http
1363 1363
 	if vars == nil {
1364 1364
 		return fmt.Errorf("Missing parameter")
1365 1365
 	}
1366
-	if err := eng.Job("execResize", vars["name"], r.Form.Get("h"), r.Form.Get("w")).Run(); err != nil {
1366
+
1367
+	height, err := strconv.Atoi(r.Form.Get("h"))
1368
+	if err != nil {
1369
+		return nil
1370
+	}
1371
+	width, err := strconv.Atoi(r.Form.Get("w"))
1372
+	if err != nil {
1373
+		return nil
1374
+	}
1375
+
1376
+	d := getDaemon(eng)
1377
+	if err := d.ContainerExecResize(vars["name"], height, width); err != nil {
1367 1378
 		return err
1368 1379
 	}
1380
+
1369 1381
 	return nil
1370 1382
 }
1371 1383
 
... ...
@@ -125,7 +125,6 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
125 125
 		"info":              daemon.CmdInfo,
126 126
 		"kill":              daemon.ContainerKill,
127 127
 		"logs":              daemon.ContainerLogs,
128
-		"resize":            daemon.ContainerResize,
129 128
 		"restart":           daemon.ContainerRestart,
130 129
 		"start":             daemon.ContainerStart,
131 130
 		"stop":              daemon.ContainerStop,
... ...
@@ -133,7 +132,6 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
133 133
 		"wait":              daemon.ContainerWait,
134 134
 		"execCreate":        daemon.ContainerExecCreate,
135 135
 		"execStart":         daemon.ContainerExecStart,
136
-		"execResize":        daemon.ContainerExecResize,
137 136
 		"execInspect":       daemon.ContainerExecInspect,
138 137
 	} {
139 138
 		if err := eng.Register(name, method); err != nil {
... ...
@@ -1,48 +1,6 @@
1 1
 package daemon
2 2
 
3
-import (
4
-	"fmt"
5
-	"strconv"
6
-
7
-	"github.com/docker/docker/engine"
8
-)
9
-
10
-func (daemon *Daemon) ContainerResize(job *engine.Job) error {
11
-	if len(job.Args) != 3 {
12
-		return fmt.Errorf("Not enough arguments. Usage: %s CONTAINER HEIGHT WIDTH\n", job.Name)
13
-	}
14
-	name := job.Args[0]
15
-	height, err := strconv.Atoi(job.Args[1])
16
-	if err != nil {
17
-		return err
18
-	}
19
-	width, err := strconv.Atoi(job.Args[2])
20
-	if err != nil {
21
-		return err
22
-	}
23
-	container, err := daemon.Get(name)
24
-	if err != nil {
25
-		return err
26
-	}
27
-	if err := container.Resize(height, width); err != nil {
28
-		return err
29
-	}
30
-	return nil
31
-}
32
-
33
-func (daemon *Daemon) ContainerExecResize(job *engine.Job) error {
34
-	if len(job.Args) != 3 {
35
-		return fmt.Errorf("Not enough arguments. Usage: %s EXEC HEIGHT WIDTH\n", job.Name)
36
-	}
37
-	name := job.Args[0]
38
-	height, err := strconv.Atoi(job.Args[1])
39
-	if err != nil {
40
-		return err
41
-	}
42
-	width, err := strconv.Atoi(job.Args[2])
43
-	if err != nil {
44
-		return err
45
-	}
3
+func (daemon *Daemon) ContainerExecResize(name string, height, width int) error {
46 4
 	execConfig, err := daemon.getExecConfig(name)
47 5
 	if err != nil {
48 6
 		return err