From f21d93ba605e6599d6393d4902c4cda5169e320e Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Fri, 24 Oct 2014 10:50:09 -0700 Subject: [PATCH] client: define DefaultRequestTimeout --- client/http.go | 3 ++- discovery/discovery.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/http.go b/client/http.go index 8e8a402c1..aa2a65078 100644 --- a/client/http.go +++ b/client/http.go @@ -26,7 +26,8 @@ import ( ) var ( - ErrTimeout = context.DeadlineExceeded + ErrTimeout = context.DeadlineExceeded + DefaultRequestTimeout = 5 * time.Second ) // transport mimics http.Transport to provide an interface which can be diff --git a/discovery/discovery.go b/discovery/discovery.go index bba0b4cfe..786a0da4c 100644 --- a/discovery/discovery.go +++ b/discovery/discovery.go @@ -105,7 +105,7 @@ func New(durl string, id uint64, config string) (Discoverer, error) { if err != nil { return nil, err } - c, err := client.NewDiscoveryKeysAPI(&http.Transport{Proxy: pf}, u.String(), time.Second*5) + c, err := client.NewDiscoveryKeysAPI(&http.Transport{Proxy: pf}, u.String(), client.DefaultRequestTimeout) if err != nil { return nil, err }