homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge current v2.6 into master

Browse source
This commit is contained in:
Tom Moulard 2022-03-22 15:55:22 +01:00
commit 3bf4a8fbe2
No known key found for this signature in database
GPG key ID: 521ABE0C1A0DEAF6
25 changed files with 102 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkg/server/routerfactory.go
View file

@ -35,7 +35,8 @@ type RouterFactory struct {
// NewRouterFactory creates a new RouterFactory.
func NewRouterFactory(staticConfiguration static.Configuration, managerFactory *service.ManagerFactory, tlsManager *tls.Manager,
chainBuilder *middleware.ChainBuilder, pluginBuilder middleware.PluginsBuilder, metricsRegistry metrics.Registry) *RouterFactory {
chainBuilder *middleware.ChainBuilder, pluginBuilder middleware.PluginsBuilder, metricsRegistry metrics.Registry,
) *RouterFactory {
var entryPointsTCP, entryPointsUDP []string
for name, cfg := range staticConfiguration.EntryPoints {
protocol, err := cfg.GetProtocol()

3
pkg/server/server.go
View file

@ -31,7 +31,8 @@ type Server struct {
// NewServer returns an initialized Server.
func NewServer(routinesPool *safe.Pool, entryPoints TCPEntryPoints, entryPointsUDP UDPEntryPoints, watcher *ConfigurationWatcher,
chainBuilder *middleware.ChainBuilder, accessLoggerMiddleware *accesslog.Handler) *Server {
chainBuilder *middleware.ChainBuilder, accessLoggerMiddleware *accesslog.Handler,
) *Server {
srv := &Server{
watcher: watcher,
tcpEntryPoints: entryPoints,