1
0
Fork 0

Clean old

This commit is contained in:
Ludovic Fernandez 2019-03-18 11:30:07 +01:00 committed by Traefiker Bot
parent 9908137638
commit 72ffa91fe0
195 changed files with 83 additions and 37524 deletions

View file

@ -6,7 +6,7 @@ import (
"net"
"net/http"
"github.com/containous/traefik/old/middlewares"
"github.com/containous/traefik/pkg/middlewares"
)
var (

View file

@ -53,7 +53,7 @@ type Handler struct {
func WrapHandler(handler *Handler) alice.Constructor {
return func(next http.Handler) (http.Handler, error) {
return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
handler.ServeHTTP(rw, req, next.ServeHTTP)
handler.ServeHTTP(rw, req, next)
}), nil
}
}
@ -140,7 +140,7 @@ func GetLogData(req *http.Request) *LogData {
return nil
}
func (h *Handler) ServeHTTP(rw http.ResponseWriter, req *http.Request, next http.HandlerFunc) {
func (h *Handler) ServeHTTP(rw http.ResponseWriter, req *http.Request, next http.Handler) {
now := time.Now().UTC()
core := CoreLogData{

View file

@ -67,7 +67,7 @@ func TestLogRotation(t *testing.T) {
writeDone := make(chan bool)
go func() {
for i := 0; i < iterations; i++ {
logHandler.ServeHTTP(recorder, req, next)
logHandler.ServeHTTP(recorder, req, http.HandlerFunc(next))
if i == iterations/2 {
halfDone <- true
}
@ -624,7 +624,7 @@ func doLogging(t *testing.T, config *types.AccessLog) {
},
}
logger.ServeHTTP(httptest.NewRecorder(), req, logWriterTestHandlerFunc)
logger.ServeHTTP(httptest.NewRecorder(), req, http.HandlerFunc(logWriterTestHandlerFunc))
}
func logWriterTestHandlerFunc(rw http.ResponseWriter, r *http.Request) {