Merge pull request #357 from nautsio/consul_tcp_health_check

added Consul TCP Health Check

consul/consul.go

@@ -80,10 +80,15 @@ func (r *ConsulAdapter) buildCheck(service *bridge.Service) *consulapi.AgentServ
 		check.Script = r.interpolateService(script, service)
 	} else if ttl := service.Attrs["check_ttl"]; ttl != "" {
 		check.TTL = ttl
+	} else if tcp := service.Attrs["check_tcp"]; tcp != "" {
+		check.TCP = fmt.Sprintf("%s:%d", service.IP, service.Port)
+		if timeout := service.Attrs["check_timeout"]; timeout != "" {
+			check.Timeout = timeout
+		}
 	} else {
 		return nil
 	}
-	if check.Script != "" || check.HTTP != "" {
+	if check.Script != "" || check.HTTP != "" || check.TCP != "" {
 		if interval := service.Attrs["check_interval"]; interval != "" {
 			check.Interval = interval
 		} else {

docs/user/backends.md

@@ -33,6 +33,18 @@ SERVICE_80_CHECK_TIMEOUT=1s		# optional, Consul default used otherwise
 It works for services on any port, not just 80. If its the only service,
 you can also use `SERVICE_CHECK_HTTP`.
 
+### Consul TCP Check
+
+This feature is only available when using Consul 0.6 or newer. Containers
+specifying these extra metadata in labels or environment will be used to
+register an TCP health check with the service.
+
+```bash
+SERVICE_443_CHECK_TCP=true
+SERVICE_443_CHECK_INTERVAL=15s
+SERVICE_443_CHECK_TIMEOUT=3s		# optional, Consul default used otherwise
+```
+
 ### Consul Script Check
 
 This feature is tricky because it lets you specify a script check to run from