1. docker
  2. Commit 28b5ae8cc4492f7b3cc2eb2b30b0f41713822b25
Browse code

changed default value of getenvint to 0. fix tests

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)

Victor Vieux authored on 2014/01/31 11:06:08
Showing 5 changed files
api.go
History View file @ 28b5ae8
... ... 
@@ -584,7 +584,11 @@ func postContainersRestart(srv *Server, version float64, w http.ResponseWriter,
584 584 
 		return fmt.Errorf("Missing parameter")
585 585 
 	}
586 586 
 	job := srv.Eng.Job("restart", vars["name"])
587 
-	job.Setenv("t", r.Form.Get("t"))
587 
+	if r.Form.Get("t") == "" {
588 
+		job.Setenv("t", "-1")
589 
+	} else {
590 
+		job.Setenv("t", r.Form.Get("t"))
591 
+	}
588 592 
 	if err := job.Run(); err != nil {
589 593 
 		return err
590 594 
 	}
... ... 
@@ -652,7 +656,11 @@ func postContainersStop(srv *Server, version float64, w http.ResponseWriter, r *
652 652 
 		return fmt.Errorf("Missing parameter")
653 653 
 	}
654 654 
 	job := srv.Eng.Job("stop", vars["name"])
655 
-	job.Setenv("t", r.Form.Get("t"))
655 
+	if r.Form.Get("t") == "" {
656 
+		job.Setenv("t", "-1")
657 
+	} else {
658 
+		job.Setenv("t", r.Form.Get("t"))
659 
+	}
656 660 
 	if err := job.Run(); err != nil {
657 661 
 		return err
658 662 
 	}
config.go
History View file @ 28b5ae8
... ... 
@@ -43,7 +43,7 @@ func DaemonConfigFromJob(job *engine.Job) *DaemonConfig {
43 43 
 	} else {
44 44 
 		config.BridgeIface = DefaultNetworkBridge
45 45 
 	}
46 
-	if mtu := job.GetenvInt("Mtu"); mtu != -1 {
46 
+	if mtu := job.GetenvInt("Mtu"); mtu != 0 {
47 47 
 		config.Mtu = mtu
48 48 
 	} else {
49 49 
 		config.Mtu = DefaultNetworkMtu
engine/env.go
History View file @ 28b5ae8
... ... 
@@ -60,7 +60,7 @@ func (env *Env) GetInt64(key string) int64 {
60 60 
 	s := strings.Trim(env.Get(key), " \t")
61 61 
 	val, err := strconv.ParseInt(s, 10, 64)
62 62 
 	if err != nil {
63 
-		return -1
63 
+		return 0
64 64 
 	}
65 65 
 	return val
66 66 
 }
engine/env_test.go
History View file @ 28b5ae8
... ... 
@@ -62,7 +62,7 @@ func TestSetenvInt(t *testing.T) {
62 62 
 	if val := job.GetenvInt("bar"); val != 42 {
63 63 
 		t.Fatalf("GetenvInt returns incorrect value: %d", val)
64 64 
 	}
65 
-	if val := job.GetenvInt("nonexistent"); val != -1 {
65 
+	if val := job.GetenvInt("nonexistent"); val != 0 {
66 66 
 		t.Fatalf("GetenvInt returns incorrect value: %d", val)
67 67 
 	}
68 68 
 }
server.go
History View file @ 28b5ae8
... ... 
@@ -1083,7 +1083,7 @@ func (srv *Server) Containers(job *engine.Job) engine.Status {
1083 1083 
 	}, -1)
1084 1084
1085 1085 
 	for _, container := range srv.runtime.List() {
1086 
-		if !container.State.IsRunning() && !all && n == -1 && since == "" && before == "" {
1086 
+		if !container.State.IsRunning() && !all && n <= 0 && since == "" && before == "" {
1087 1087 
 			continue
1088 1088 
 		}
1089 1089 
 		if before != "" && !foundBefore {
... ... 
@@ -1092,7 +1092,7 @@ func (srv *Server) Containers(job *engine.Job) engine.Status {
1092 1092 
 			}
1093 1093 
 			continue
1094 1094 
 		}
1095 
-		if displayed == n {
1095 
+		if n > 0 && displayed == n {
1096 1096 
 			break
1097 1097 
 		}
1098 1098 
 		if container.ID == since || utils.TruncateID(container.ID) == since {
... ... 
@@ -1742,7 +1742,7 @@ func (srv *Server) ContainerCreate(job *engine.Job) engine.Status {
1742 1742 
 		return engine.StatusErr
1743 1743 
 	}
1744 1744 
 	config := ContainerConfigFromJob(job)
1745 
-	if config.Memory > 0 && config.Memory < 524288 {
1745 
+	if config.Memory != 0 && config.Memory < 524288 {
1746 1746 
 		job.Errorf("Minimum memory limit allowed is 512k")
1747 1747 
 		return engine.StatusErr
1748 1748 
 	}