SW/traefik
2
0
Fork 1
forked from Ivasoft/traefik
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean old

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/server/roundtripper.go
View File

@@ -7,7 +7,6 @@ import (
"net/http"
"time"
"github.com/containous/traefik/old/configuration"
"github.com/containous/traefik/pkg/config/static"
"github.com/containous/traefik/pkg/log"
traefiktls "github.com/containous/traefik/pkg/tls"
@@ -35,7 +34,7 @@ func createHTTPTransport(transportConfiguration *static.ServersTransport) (*http
}
dialer := &net.Dialer{
Timeout: configuration.DefaultDialTimeout,
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
DualStack: true,
}

8
pkg/server/service/service.go
View File

@@ -9,12 +9,12 @@ import (
"time"
"github.com/containous/alice"
"github.com/containous/traefik/old/middlewares/pipelining"
"github.com/containous/traefik/pkg/config"
"github.com/containous/traefik/pkg/healthcheck"
"github.com/containous/traefik/pkg/log"
"github.com/containous/traefik/pkg/middlewares/accesslog"
"github.com/containous/traefik/pkg/middlewares/emptybackendhandler"
"github.com/containous/traefik/pkg/middlewares/pipelining"
"github.com/containous/traefik/pkg/server/cookie"
"github.com/containous/traefik/pkg/server/internal"
"github.com/vulcand/oxy/roundrobin"
@@ -76,7 +76,7 @@ func (m *Manager) getLoadBalancerServiceHandler(
return accesslog.NewFieldHandler(next, accesslog.ServiceName, serviceName, accesslog.AddServiceFields), nil
}
handler, err := alice.New().Append(alHandler).Then(pipelining.NewPipelining(fwd))
handler, err := alice.New().Append(alHandler).Then(pipelining.New(ctx, fwd, "pipelining"))
if err != nil {
return nil, err
}
@@ -100,10 +100,10 @@ func (m *Manager) LaunchHealthCheck() {
for serviceName, balancers := range m.balancers {
ctx := log.With(context.Background(), log.Str(log.ServiceName, serviceName))
// FIXME aggregate
// TODO aggregate
balancer := balancers[0]
// FIXME Should all the services handle healthcheck? Handle different types
// TODO Should all the services handle healthcheck? Handle different types
service := m.configs[serviceName].LoadBalancer
// Health Check