Fixes #37 | Configure consul timeouts

README.md

@@ -70,6 +70,7 @@ consul-ssl-cert        |                       | Path to an SSL client certifica
 consul-ssl-verify      | `true`                | Verify certificates when connecting via SSL
 consul-token           |                       | The Consul ACL token
 consul-tag             | `marathon`            | Common tag name added to every service registered in Consul, should be unique for every Marathon-cluster connected to Consul
+consul-timeout         | `1 s`                 | Max request duration
 listen                 | `:4000`               | Accept connections at this address
 log-level              | `info`                | Log level: panic, fatal, error, warn, info, or debug
 log-format             | `text`                | Log format: JSON, text

config/config.go

@@ -68,6 +68,7 @@ func (config *Config) parseFlags() {
 	flag.StringVar(&config.Consul.SslCaCert, "consul-ssl-ca-cert", "", "Path to a CA certificate file, containing one or more CA certificates to use to validate the certificate sent by the Consul server to us")
 	flag.StringVar(&config.Consul.Token, "consul-token", "", "The Consul ACL token")
 	flag.StringVar(&config.Consul.Tag, "consul-tag", "marathon", "Common tag name added to every service registered in Consul, should be unique for every Marathon-cluster connected to Consul")
+	flag.DurationVar(&config.Consul.Timeout, "consul-timeout", time.Second, "Max request duration")
 
 	// Web
 	flag.StringVar(&config.Web.Listen, "listen", ":4000", "accept connections at this address")

config/config_test.go

@@ -93,7 +93,9 @@ func TestConfig_ShouldBeMergedWithFileDefaultsAndFlags(t *testing.T) {
 			SslCert:    "",
 			SslCaCert:  "",
 			Token:      "",
-			Tag:        "marathon"},
+			Tag:        "marathon",
+			Timeout:    1 * time.Second,
+		},
 		Web: struct{ Listen string }{Listen: ":4000"},
 		Sync: sync.Config{
 			Interval: 15 * time.Minute,

consul/agents.go

@@ -85,6 +85,11 @@ func (a *ConcurrentAgents) createAgent(host string) (*consulapi.Client, error) {
 		config.Scheme = "https"
 	}
 
+	if a.config.Timeout != 0 {
+		log.Debugf("Seting timeout to %s", a.config.Timeout.String())
+		config.HttpClient.Timeout = a.config.Timeout
+	}
+
 	if !a.config.SslVerify {
 		log.Debugf("Disabled SSL verification")
 		config.HttpClient.Transport = &http.Transport{

consul/config.go

@@ -1,5 +1,7 @@
 package consul
 
+import "time"
+
 type ConsulConfig struct {
 	Auth       Auth
 	Port       string
@@ -9,6 +11,7 @@ type ConsulConfig struct {
 	SslCaCert  string
 	Token      string
 	Tag        string
+	Timeout    time.Duration
 }
 
 type Auth struct {

consul/consul_test.go

@@ -5,6 +5,7 @@ import (
 	"github.com/allegro/marathon-consul/utils"
 	"github.com/stretchr/testify/assert"
 	"testing"
+	"time"
 )
 
 func TestGetAgent_WithEmptyHost(t *testing.T) {
@@ -23,7 +24,7 @@ func TestGetAgent_FullConfig(t *testing.T) {
 
 	// given
 	agents := NewAgents(&ConsulConfig{Token: "token", SslEnabled: true,
-		Auth: Auth{Enabled: true, Username: "", Password: ""}})
+		Auth: Auth{Enabled: true, Username: "", Password: ""}, Timeout: time.Second})
 
 	// when
 	agent, err := agents.GetAgent("host")

debian/config.json

@@ -11,7 +11,8 @@
     "SslCert": "",
     "SslCaCert": "",
     "Token": "",
-    "Tag": "marathon"
+    "Tag": "marathon",
+    "Timeout": 1000000000
   },
   "Web": {
     "Listen": ":4000"