From e743ab088289756979e2971b41cf1de9bf320643 Mon Sep 17 00:00:00 2001 From: mgniu Date: Fri, 12 Aug 2016 10:50:22 +0800 Subject: [PATCH 1/2] replace `handleWithGlobalMiddlewares` with `handlerWithGlobalMiddlewares` Signed-off-by: mgniu --- api/server/middleware.go | 2 +- api/server/server.go | 2 +- api/server/server_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/server/middleware.go b/api/server/middleware.go index 108e3c077c..5a987b015a 100644 --- a/api/server/middleware.go +++ b/api/server/middleware.go @@ -9,7 +9,7 @@ import ( // handleWithGlobalMiddlwares wraps the handler function for a request with // the server's global middlewares. The order of the middlewares is backwards, // 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 for _, m := range s.middlewares { diff --git a/api/server/server.go b/api/server/server.go index b67fe52846..84a0558ae3 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -129,7 +129,7 @@ func (s *Server) makeHTTPHandler(handler httputils.APIFunc) http.HandlerFunc { // immediate function being called should still be passed // as 'args' on the function call. ctx := context.Background() - handlerFunc := s.handleWithGlobalMiddlewares(handler) + handlerFunc := s.handlerWithGlobalMiddlewares(handler) vars := mux.Vars(r) if vars == nil { diff --git a/api/server/server_test.go b/api/server/server_test.go index 13c28eab78..11831c148d 100644 --- a/api/server/server_test.go +++ b/api/server/server_test.go @@ -39,7 +39,7 @@ func TestMiddlewares(t *testing.T) { return nil } - handlerFunc := srv.handleWithGlobalMiddlewares(localHandler) + handlerFunc := srv.handlerWithGlobalMiddlewares(localHandler) if err := handlerFunc(ctx, resp, req, map[string]string{}); err != nil { t.Fatal(err) } From c5ecf1e6fe98cbf9a20d59f9ca5eb69f9c72210b Mon Sep 17 00:00:00 2001 From: mgniu Date: Fri, 26 Aug 2016 18:26:15 +0800 Subject: [PATCH 2/2] change comment Signed-off-by: mgniu --- api/server/middleware.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/server/middleware.go b/api/server/middleware.go index 5a987b015a..537ce8028f 100644 --- a/api/server/middleware.go +++ b/api/server/middleware.go @@ -6,7 +6,7 @@ import ( "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, // meaning that the first in the list will be evaluated last. func (s *Server) handlerWithGlobalMiddlewares(handler httputils.APIFunc) httputils.APIFunc {