Merge current v2.6 into master

2022-03-22 15:55:22 +01:00
parent 2da7fa0397 23a6602cbf
commit 3bf4a8fbe2
25 changed files with 102 additions and 36 deletions
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -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,