Merge branch v2.4 into master

This commit is contained in:
kevinpollet 2021-01-25 12:42:23 +01:00
commit 2461e36ed4
No known key found for this signature in database
GPG key ID: 0C9A5DDD1B292453
14 changed files with 214 additions and 56 deletions

View file

@ -16,10 +16,6 @@ import (
"github.com/traefik/traefik/v2/pkg/server/provider"
)
const (
recoveryMiddlewareName = "traefik-internal-recovery"
)
type middlewareBuilder interface {
BuildChain(ctx context.Context, names []string) *alice.Chain
}
@ -130,7 +126,7 @@ func (m *Manager) buildEntryPointHandler(ctx context.Context, configs map[string
chain := alice.New()
chain = chain.Append(func(next http.Handler) (http.Handler, error) {
return recovery.New(ctx, next, recoveryMiddlewareName)
return recovery.New(ctx, next)
})
return chain.Then(router)