kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #25650 from pwzgorilla/master 

replace `handleWithGlobalMiddlewares` with `handlerWithGlobalMiddlewa…
This commit is contained in:
Tõnis Tiigi 2016-08-26 09:51:51 -07:00 committed by GitHub
parent cbd4e4d48a c5ecf1e6fe
commit e875370af8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/server/middleware.go
View File

@ -6,10 +6,10 @@ import (
"github.com/docker/docker/api/server/middleware" "github.com/docker/docker/api/server/middleware"
) )
// handleWithGlobalMiddlwares wraps the handler function for a request with // handlerWithGlobalMiddlewares wraps the handler function for a request with
// the server's global middlewares. The order of the middlewares is backwards, // the server's global middlewares. The order of the middlewares is backwards,
// meaning that the first in the list will be evaluated last. // meaning that the first in the list will be evaluated last.
func (s *Server) handleWithGlobalMiddlewares(handler httputils.APIFunc) httputils.APIFunc { func (s *Server) handlerWithGlobalMiddlewares(handler httputils.APIFunc) httputils.APIFunc {
next := handler next := handler
for _, m := range s.middlewares { for _, m := range s.middlewares {

2
api/server/server.go
View File

@ -129,7 +129,7 @@ func (s *Server) makeHTTPHandler(handler httputils.APIFunc) http.HandlerFunc {
// immediate function being called should still be passed // immediate function being called should still be passed
// as 'args' on the function call. // as 'args' on the function call.
ctx := context.Background() ctx := context.Background()
handlerFunc := s.handleWithGlobalMiddlewares(handler) handlerFunc := s.handlerWithGlobalMiddlewares(handler)
vars := mux.Vars(r) vars := mux.Vars(r)
if vars == nil { if vars == nil {

2
api/server/server_test.go
View File

@ -39,7 +39,7 @@ func TestMiddlewares(t *testing.T) {
return nil return nil
} }
handlerFunc := srv.handleWithGlobalMiddlewares(localHandler) handlerFunc := srv.handlerWithGlobalMiddlewares(localHandler)
if err := handlerFunc(ctx, resp, req, map[string]string{}); err != nil { if err := handlerFunc(ctx, resp, req, map[string]string{}); err != nil {
t.Fatal(err) t.Fatal(err)
} }