kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #5031 from crosbymichael/revert-env

Browse source 
Revert env changes
This commit is contained in:
Victor Vieux 2014-04-04 13:19:08 -07:00
commit 36af2936af
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/server/server_unit_test.go
View file

@ -70,7 +70,7 @@ func TestGetVersion(t *testing.T) {
eng.Register("version", func(job *engine.Job) engine.Status {
called = true
v := &engine.Env{}
v.Set("Version", "42.1")
v.SetJson("Version", "42.1")
v.Set("ApiVersion", "1.1.1.1.1")
v.Set("GoVersion", "2.42")
v.Set("Os", "Linux")

20
engine/env.go
View file

@ -194,7 +194,25 @@ func (env *Env) SetAuto(k string, v interface{}) {
}
func (env *Env) Encode(dst io.Writer) error {
return json.NewEncoder(dst).Encode(env.Map())
m := make(map[string]interface{})
for k, v := range env.Map() {
var val interface{}
if err := json.Unmarshal([]byte(v), &val); err == nil {
// FIXME: we fix-convert float values to int, because
// encoding/json decodes integers to float64, but cannot encode them back.
// (See http://golang.org/src/pkg/encoding/json/decode.go#L46)
if fval, isFloat := val.(float64); isFloat {
val = int(fval)
}
m[k] = val
} else {
m[k] = v
}
}
if err := json.NewEncoder(dst).Encode(&m); err != nil {
return err
}
return nil
}
func (env *Env) WriteTo(dst io.Writer) (n int64, err error) {

18
engine/env_test.go
View file

@ -95,21 +95,3 @@ func TestEnviron(t *testing.T) {
t.Fatalf("bar not found in the environ")
}
}
func TestEnvWriteTo(t *testing.T) {
e := &Env{}
inputKey := "Version"
inputVal := "42.1"
e.Set(inputKey, inputVal)
out := NewOutput()
e2, err := out.AddEnv()
if err != nil {
t.Fatal(err)
}
e.WriteTo(out)
result := e2.Get(inputKey)
expected := inputVal
if expected != result {
t.Fatalf("%#v\n", result)
}
}

2
server/server.go
View file

@ -846,7 +846,7 @@ func (srv *Server) DockerInfo(job *engine.Job) engine.Status {
func (srv *Server) DockerVersion(job *engine.Job) engine.Status {
v := &engine.Env{}
v.Set("Version", dockerversion.VERSION)
v.Set("ApiVersion", string(api.APIVERSION))
v.SetJson("ApiVersion", api.APIVERSION)
v.Set("GitCommit", dockerversion.GITCOMMIT)
v.Set("GoVersion", goruntime.Version())
v.Set("Os", goruntime.GOOS)