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

Merge pull request #1398 from containous/fix-default-timeouts-for-marathon-provider

Browse source 
Fix default timeouts for Marathon provider.
This commit is contained in:
Vincent Demeester 2017-04-20 08:37:20 +02:00 committed by GitHub
commit 9c9015a7b1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configuration.go
View file

@ -371,8 +371,8 @@ func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration {
defaultMarathon.Endpoint = "http://127.0.0.1:8080" defaultMarathon.Endpoint = "http://127.0.0.1:8080"
defaultMarathon.ExposedByDefault = true defaultMarathon.ExposedByDefault = true
defaultMarathon.Constraints = types.Constraints{} defaultMarathon.Constraints = types.Constraints{}
defaultMarathon.DialerTimeout = 60 defaultMarathon.DialerTimeout = flaeg.Duration(60 * time.Second)
defaultMarathon.KeepAlive = 10 defaultMarathon.KeepAlive = flaeg.Duration(10 * time.Second)
// default Consul // default Consul
var defaultConsul consul.Provider var defaultConsul consul.Provider