mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
replace handleWithGlobalMiddlewares
with handlerWithGlobalMiddlewares
Signed-off-by: mgniu <mgniu@dataman-inc.com>
This commit is contained in:
parent
2a540c18b6
commit
e743ab0882
3 changed files with 3 additions and 3 deletions
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue