clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 21:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove engine.Status and replace it with standard go error

Browse Source 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
This commit is contained in:
Antonio Murdaca
2015-03-25 22:32:08 +01:00
parent 3d9cbf0e71
commit c79b9bab54
49 changed files with 525 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/server/server.go
+6 -6
View File
@@ -1097,7 +1097,7 @@ func postBuild(eng *engine.Engine, version version.Version, w http.ResponseWrite
select {
case <-finished:
case <-closeNotifier.CloseNotify():
log.Infof("Client disconnected, cancelling job: %v", job)
log.Infof("Client disconnected, cancelling job: %s", job.Name)
job.Cancel()
}
}()
@@ -1581,9 +1581,9 @@ type Server interface {
// ServeApi loops through all of the protocols sent in to docker and spawns
// off a go routine to setup a serving http.Server for each.
func ServeApi(job *engine.Job) engine.Status {
func ServeApi(job *engine.Job) error {
if len(job.Args) == 0 {
return job.Errorf("usage: %s PROTO://ADDR [PROTO://ADDR ...]", job.Name)
return fmt.Errorf("usage: %s PROTO://ADDR [PROTO://ADDR ...]", job.Name)
}
var (
protoAddrs = job.Args
@@ -1594,7 +1594,7 @@ func ServeApi(job *engine.Job) engine.Status {
for _, protoAddr := range protoAddrs {
protoAddrParts := strings.SplitN(protoAddr, "://", 2)
if len(protoAddrParts) != 2 {
return job.Errorf("usage: %s PROTO://ADDR [PROTO://ADDR ...]", job.Name)
return fmt.Errorf("usage: %s PROTO://ADDR [PROTO://ADDR ...]", job.Name)
}
go func() {
log.Infof("Listening for HTTP on %s (%s)", protoAddrParts[0], protoAddrParts[1])
@@ -1618,9 +1618,9 @@ func ServeApi(job *engine.Job) engine.Status {
for i := 0; i < len(protoAddrs); i++ {
err := <-chErrors
if err != nil {
return job.Error(err)
return err
}
}
return engine.StatusOK
return nil
}
api/server/server_linux.go
+2 -2
View File
@@ -90,7 +90,7 @@ func serveFd(addr string, job *engine.Job) error {
}
// Called through eng.Job("acceptconnections")
func AcceptConnections(job *engine.Job) engine.Status {
func AcceptConnections(job *engine.Job) error {
// Tell the init daemon we are accepting requests
go systemd.SdNotify("READY=1")
@@ -99,5 +99,5 @@ func AcceptConnections(job *engine.Job) engine.Status {
close(activationLock)
}
return engine.StatusOK
return nil
}
api/server/server_unit_test.go
+40 -40
View File
@@ -63,7 +63,7 @@ func TesthttpError(t *testing.T) {
func TestGetVersion(t *testing.T) {
eng := engine.New()
var called bool
eng.Register("version", func(job *engine.Job) engine.Status {
eng.Register("version", func(job *engine.Job) error {
called = true
v := &engine.Env{}
v.SetJson("Version", "42.1")
@@ -72,9 +72,9 @@ func TestGetVersion(t *testing.T) {
v.Set("Os", "Linux")
v.Set("Arch", "x86_64")
if _, err := v.WriteTo(job.Stdout); err != nil {
return job.Error(err)
return err
}
return engine.StatusOK
return nil
})
r := serveRequest("GET", "/version", nil, eng, t)
if !called {
@@ -92,15 +92,15 @@ func TestGetVersion(t *testing.T) {
func TestGetInfo(t *testing.T) {
eng := engine.New()
var called bool
eng.Register("info", func(job *engine.Job) engine.Status {
eng.Register("info", func(job *engine.Job) error {
called = true
v := &engine.Env{}
v.SetInt("Containers", 1)
v.SetInt("Images", 42000)
if _, err := v.WriteTo(job.Stdout); err != nil {
return job.Error(err)
return err
}
return engine.StatusOK
return nil
})
r := serveRequest("GET", "/info", nil, eng, t)
if !called {
@@ -119,13 +119,13 @@ func TestGetInfo(t *testing.T) {
func TestGetImagesJSON(t *testing.T) {
eng := engine.New()
var called bool
eng.Register("images", func(job *engine.Job) engine.Status {
eng.Register("images", func(job *engine.Job) error {
called = true
v := createEnvFromGetImagesJSONStruct(sampleImage)
if _, err := v.WriteTo(job.Stdout); err != nil {
return job.Error(err)
return err
}
return engine.StatusOK
return nil
})
r := serveRequest("GET", "/images/json", nil, eng, t)
if !called {
@@ -145,9 +145,9 @@ func TestGetImagesJSON(t *testing.T) {
func TestGetImagesJSONFilter(t *testing.T) {
eng := engine.New()
filter := "nothing"
eng.Register("images", func(job *engine.Job) engine.Status {
eng.Register("images", func(job *engine.Job) error {
filter = job.Getenv("filter")
return engine.StatusOK
return nil
})
serveRequest("GET", "/images/json?filter=aaaa", nil, eng, t)
if filter != "aaaa" {
@@ -158,9 +158,9 @@ func TestGetImagesJSONFilter(t *testing.T) {
func TestGetImagesJSONFilters(t *testing.T) {
eng := engine.New()
filter := "nothing"
eng.Register("images", func(job *engine.Job) engine.Status {
eng.Register("images", func(job *engine.Job) error {
filter = job.Getenv("filters")
return engine.StatusOK
return nil
})
serveRequest("GET", "/images/json?filters=nnnn", nil, eng, t)
if filter != "nnnn" {
@@ -171,9 +171,9 @@ func TestGetImagesJSONFilters(t *testing.T) {
func TestGetImagesJSONAll(t *testing.T) {
eng := engine.New()
allFilter := "-1"
eng.Register("images", func(job *engine.Job) engine.Status {
eng.Register("images", func(job *engine.Job) error {
allFilter = job.Getenv("all")
return engine.StatusOK
return nil
})
serveRequest("GET", "/images/json?all=1", nil, eng, t)
if allFilter != "1" {
@@ -184,14 +184,14 @@ func TestGetImagesJSONAll(t *testing.T) {
func TestGetImagesJSONLegacyFormat(t *testing.T) {
eng := engine.New()
var called bool
eng.Register("images", func(job *engine.Job) engine.Status {
eng.Register("images", func(job *engine.Job) error {
called = true
outsLegacy := engine.NewTable("Created", 0)
outsLegacy.Add(createEnvFromGetImagesJSONStruct(sampleImage))
if _, err := outsLegacy.WriteListTo(job.Stdout); err != nil {
return job.Error(err)
return err
}
return engine.StatusOK
return nil
})
r := serveRequestUsingVersion("GET", "/images/json", "1.6", nil, eng, t)
if !called {
@@ -219,7 +219,7 @@ func TestGetContainersByName(t *testing.T) {
eng := engine.New()
name := "container_name"
var called bool
eng.Register("container_inspect", func(job *engine.Job) engine.Status {
eng.Register("container_inspect", func(job *engine.Job) error {
called = true
if job.Args[0] != name {
t.Errorf("name != '%s': %#v", name, job.Args[0])
@@ -232,9 +232,9 @@ func TestGetContainersByName(t *testing.T) {
v := &engine.Env{}
v.SetBool("dirty", true)
if _, err := v.WriteTo(job.Stdout); err != nil {
return job.Error(err)
return err
}
return engine.StatusOK
return nil
})
r := serveRequest("GET", "/containers/"+name+"/json", nil, eng, t)
if !called {
@@ -253,7 +253,7 @@ func TestGetContainersByName(t *testing.T) {
func TestGetEvents(t *testing.T) {
eng := engine.New()
var called bool
eng.Register("events", func(job *engine.Job) engine.Status {
eng.Register("events", func(job *engine.Job) error {
called = true
since := job.Getenv("since")
if since != "1" {
@@ -267,9 +267,9 @@ func TestGetEvents(t *testing.T) {
v.Set("since", since)
v.Set("until", until)
if _, err := v.WriteTo(job.Stdout); err != nil {
return job.Error(err)
return err
}
return engine.StatusOK
return nil
})
r := serveRequest("GET", "/events?since=1&until=0", nil, eng, t)
if !called {
@@ -295,7 +295,7 @@ func TestLogs(t *testing.T) {
eng := engine.New()
var inspect bool
var logs bool
eng.Register("container_inspect", func(job *engine.Job) engine.Status {
eng.Register("container_inspect", func(job *engine.Job) error {
inspect = true
if len(job.Args) == 0 {
t.Fatal("Job arguments is empty")
@@ -303,10 +303,10 @@ func TestLogs(t *testing.T) {
if job.Args[0] != "test" {
t.Fatalf("Container name %s, must be test", job.Args[0])
}
return engine.StatusOK
return nil
})
expected := "logs"
eng.Register("logs", func(job *engine.Job) engine.Status {
eng.Register("logs", func(job *engine.Job) error {
logs = true
if len(job.Args) == 0 {
t.Fatal("Job arguments is empty")
@@ -331,7 +331,7 @@ func TestLogs(t *testing.T) {
t.Fatalf("timestamps %s, must be 1", timestamps)
}
job.Stdout.Write([]byte(expected))
return engine.StatusOK
return nil
})
r := serveRequest("GET", "/containers/test/logs?follow=1&stdout=1&timestamps=1", nil, eng, t)
if r.Code != http.StatusOK {
@@ -353,7 +353,7 @@ func TestLogsNoStreams(t *testing.T) {
eng := engine.New()
var inspect bool
var logs bool
eng.Register("container_inspect", func(job *engine.Job) engine.Status {
eng.Register("container_inspect", func(job *engine.Job) error {
inspect = true
if len(job.Args) == 0 {
t.Fatal("Job arguments is empty")
@@ -361,11 +361,11 @@ func TestLogsNoStreams(t *testing.T) {
if job.Args[0] != "test" {
t.Fatalf("Container name %s, must be test", job.Args[0])
}
return engine.StatusOK
return nil
})
eng.Register("logs", func(job *engine.Job) engine.Status {
eng.Register("logs", func(job *engine.Job) error {
logs = true
return engine.StatusOK
return nil
})
r := serveRequest("GET", "/containers/test/logs", nil, eng, t)
if r.Code != http.StatusBadRequest {
@@ -388,7 +388,7 @@ func TestGetImagesHistory(t *testing.T) {
eng := engine.New()
imageName := "docker-test-image"
var called bool
eng.Register("history", func(job *engine.Job) engine.Status {
eng.Register("history", func(job *engine.Job) error {
called = true
if len(job.Args) == 0 {
t.Fatal("Job arguments is empty")
@@ -398,9 +398,9 @@ func TestGetImagesHistory(t *testing.T) {
}
v := &engine.Env{}
if _, err := v.WriteTo(job.Stdout); err != nil {
return job.Error(err)
return err
}
return engine.StatusOK
return nil
})
r := serveRequest("GET", "/images/"+imageName+"/history", nil, eng, t)
if !called {
@@ -418,7 +418,7 @@ func TestGetImagesByName(t *testing.T) {
eng := engine.New()
name := "image_name"
var called bool
eng.Register("image_inspect", func(job *engine.Job) engine.Status {
eng.Register("image_inspect", func(job *engine.Job) error {
called = true
if job.Args[0] != name {
t.Fatalf("name != '%s': %#v", name, job.Args[0])
@@ -431,9 +431,9 @@ func TestGetImagesByName(t *testing.T) {
v := &engine.Env{}
v.SetBool("dirty", true)
if _, err := v.WriteTo(job.Stdout); err != nil {
return job.Error(err)
return err
}
return engine.StatusOK
return nil
})
r := serveRequest("GET", "/images/"+name+"/json", nil, eng, t)
if !called {
@@ -455,7 +455,7 @@ func TestDeleteContainers(t *testing.T) {
eng := engine.New()
name := "foo"
var called bool
eng.Register("rm", func(job *engine.Job) engine.Status {
eng.Register("rm", func(job *engine.Job) error {
called = true
if len(job.Args) == 0 {
t.Fatalf("Job arguments is empty")
@@ -463,7 +463,7 @@ func TestDeleteContainers(t *testing.T) {
if job.Args[0] != name {
t.Fatalf("name != '%s': %#v", name, job.Args[0])
}
return engine.StatusOK
return nil
})
r := serveRequest("DELETE", "/containers/"+name, nil, eng, t)
if !called {