docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

createRouter doesn't yield errors 

Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
This commit is contained in:
Pierre Wacrenier 2015-01-13 01:59:12 +01:00
parent f7735d629b
commit 044b332759
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/api.go
View File

@ -273,7 +273,7 @@ func httpError(w http.ResponseWriter, err string, status int) {
http.Error(w, err, status)
}
func createRouter(c *context, enableCors bool) (*mux.Router, error) {
func createRouter(c *context, enableCors bool) *mux.Router {
r := mux.NewRouter()
m := map[string]map[string]handler{
"GET": {
@ -352,5 +352,5 @@ func createRouter(c *context, enableCors bool) (*mux.Router, error) {
}
}
return r, nil
return r
}

5
api/api_test.go
View File

@ -18,10 +18,7 @@ func serveRequest(c *cluster.Cluster, s *scheduler.Scheduler, w http.ResponseWri
version: "test-version",
}
r, err := createRouter(context, false)
if err != nil {
return err
}
r := createRouter(context, false)
r.ServeHTTP(w, req)
return nil
}

5
api/server.go
View File

@ -38,10 +38,7 @@ func ListenAndServe(c *cluster.Cluster, s *scheduler.Scheduler, hosts []string,
tlsConfig: tlsConfig,
}
c.Events(context.eventsHandler)
r, err := createRouter(context, enableCors)
if err != nil {
return err
}
r := createRouter(context, enableCors)
chErrors := make(chan error, len(hosts))
for _, host := range hosts {