Merge pull request #716 from jangie/allow-connection-timeout-configuration
Allow specification of dialertimeout
This commit is contained in:
commit
422aacf8e6
4 changed files with 30 additions and 7 deletions
|
@ -325,6 +325,7 @@ func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration {
|
|||
defaultMarathon.Endpoint = "http://127.0.0.1:8080"
|
||||
defaultMarathon.ExposedByDefault = true
|
||||
defaultMarathon.Constraints = []types.Constraint{}
|
||||
defaultMarathon.DialerTimeout = 60
|
||||
|
||||
// default Consul
|
||||
var defaultConsul provider.Consul
|
||||
|
|
|
@ -836,6 +836,15 @@ domain = "marathon.localhost"
|
|||
# Optional
|
||||
#
|
||||
# dcosToken = "xxxxxx"
|
||||
|
||||
# Override DialerTimeout
|
||||
# Amount of time in seconds to allow the Marathon provider to wait to open a TCP
|
||||
# connection to a Marathon master
|
||||
#
|
||||
# Optional
|
||||
# Default: 60
|
||||
# dialerTimeout = 5
|
||||
|
||||
```
|
||||
|
||||
Labels can be used on containers to override default behaviour:
|
||||
|
|
|
@ -2,6 +2,7 @@ package provider
|
|||
|
||||
import (
|
||||
"errors"
|
||||
"net"
|
||||
"net/url"
|
||||
"sort"
|
||||
"strconv"
|
||||
|
@ -33,6 +34,7 @@ type Marathon struct {
|
|||
DCOSToken string `description:"DCOSToken for DCOS environment, This will override the Authorization header"`
|
||||
MarathonLBCompatibility bool `description:"Add compatibility with marathon-lb labels"`
|
||||
TLS *ClientTLS `description:"Enable Docker TLS support"`
|
||||
DialerTimeout time.Duration `description:"Set a non-default connection timeout for Marathon"`
|
||||
Basic *MarathonBasic
|
||||
marathonClient marathon.Marathon
|
||||
}
|
||||
|
@ -70,6 +72,9 @@ func (provider *Marathon) Provide(configurationChan chan<- types.ConfigMessage,
|
|||
config.HTTPClient = &http.Client{
|
||||
Transport: &http.Transport{
|
||||
TLSClientConfig: TLSConfig,
|
||||
DialContext: (&net.Dialer{
|
||||
Timeout: time.Second * provider.DialerTimeout,
|
||||
}).DialContext,
|
||||
},
|
||||
}
|
||||
client, err := marathon.NewClient(config)
|
||||
|
|
|
@ -487,6 +487,14 @@
|
|||
#
|
||||
# groupsAsSubDomains = true
|
||||
|
||||
# Override DialerTimeout
|
||||
# Amount of time in seconds to allow the Marathon provider to wait to open a TCP
|
||||
# connection to a Marathon master
|
||||
#
|
||||
# Optional
|
||||
# Default: 60
|
||||
# dialerTimeout = 5
|
||||
|
||||
# Enable Marathon basic authentication
|
||||
#
|
||||
# Optional
|
||||
|
|
Loading…
Reference in a new issue