Add health check timeout parameter

healthcheck/healthcheck.go

@@ -42,11 +42,12 @@ type Options struct {
 	Port      int
 	Transport http.RoundTripper
 	Interval  time.Duration
+	Timeout   time.Duration
 	LB        BalancerHandler
 }
 
 func (opt Options) String() string {
-	return fmt.Sprintf("[Hostname: %s Headers: %v Path: %s Port: %d Interval: %s]", opt.Hostname, opt.Headers, opt.Path, opt.Port, opt.Interval)
+	return fmt.Sprintf("[Hostname: %s Headers: %v Path: %s Port: %d Interval: %s Timeout: %s]", opt.Hostname, opt.Headers, opt.Path, opt.Port, opt.Interval, opt.Timeout)
 }
 
 // BackendConfig HealthCheck configuration for a backend
@@ -180,9 +181,8 @@ func newHealthCheck(metrics metricsRegistry) *HealthCheck {
 // NewBackendConfig Instantiate a new BackendConfig
 func NewBackendConfig(options Options, backendName string) *BackendConfig {
 	return &BackendConfig{
-		Options:        options,
-		name:           backendName,
-		requestTimeout: 5 * time.Second,
+		Options: options,
+		name:    backendName,
 	}
 }
 
@@ -197,7 +197,7 @@ func checkHealth(serverURL *url.URL, backend *BackendConfig) error {
 	req = backend.addHeadersAndHost(req)
 
 	client := http.Client{
-		Timeout:   backend.requestTimeout,
+		Timeout:   backend.Options.Timeout,
 		Transport: backend.Options.Transport,
 	}
 

healthcheck/healthcheck_test.go

@@ -15,7 +15,8 @@ import (
 	"github.com/vulcand/oxy/roundrobin"
 )
 
-const healthCheckInterval = 100 * time.Millisecond
+const healthCheckInterval = 200 * time.Millisecond
+const healthCheckTimeout = 100 * time.Millisecond
 
 type testHandler struct {
 	done           func()
@@ -105,6 +106,7 @@ func TestSetBackendsConfiguration(t *testing.T) {
 			backend := NewBackendConfig(Options{
 				Path:     "/path",
 				Interval: healthCheckInterval,
+				Timeout:  healthCheckTimeout,
 				LB:       lb,
 			}, "backendName")