Fixes #33 Support for http.client timeout

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Changelog for go-wavefront.
 
+## [1.5.0]
+
+*Feature to configure http client timeout*
+
+- Expose http client timeout parameter 
+
 ## [1.4.0]
 
 *Add Missing Fields to Dashboards*

Makefile

@@ -20,7 +20,7 @@ vet:
  fi
 
 errcheck:
- @sh -c "'$(CURDIR)/scripts/errcheck.sh'" | grep -v example
+ @sh -c "'$(CURDIR)/scripts/errcheck.sh'"
 
 test: fmtcheck
  go test -i $(TEST) || exit 1

client.go

@@ -11,6 +11,7 @@ import (
  "net/http"
  "net/http/httputil"
  "net/url"
+ "time"
 )
 
 // Wavefronter is an interface that a Wavefront client must satisfy
@@ -28,6 +29,10 @@ type Config struct {
  // Token is an authentication token that will be passed with all requests
  Token string
 
+ // Timeout exposes the http client timeout
+ // https://golang.org/src/net/http/client.go
+ Timeout time.Duration
+
  // SET HTTP Proxy configuration
  HttpProxy string
 
@@ -59,15 +64,21 @@ func NewClient(config *Config) (*Client, error) {
  return nil, err
  }
 
+ // Added timeout to http client
+ // Timeout of zero means no timeout
+ h := &http.Client{
+ Timeout: config.Timeout,
+ Transport: &http.Transport{
+ TLSNextProto: map[string]func(authority string, c *tls.Conn) http.RoundTripper{},
+ },
+ }
+
  // need to disable http/2 as it doesn't play nicely with nginx
  // to do so we set TLSNextProto to an empty, non-nil map
- c := &Client{Config: config,
+ c := &Client{
+ Config: config,
  BaseURL: baseURL,
- httpClient: &http.Client{
- Transport: &http.Transport{
- TLSNextProto: map[string]func(authority string, c *tls.Conn) http.RoundTripper{},
- },
- },
+ httpClient: h,
  debug: false,
  }
 

scripts/errcheck.sh

@@ -12,7 +12,7 @@ err_files=$(errcheck -ignoretests \
  -ignore 'github.com/hashicorp/terraform/helper/schema:Set' \
  -ignore 'bytes:.*' \
  -ignore 'io:Close|Write' \
- $(go list ./...| grep -v /vendor/))
+ $(go list ./...| grep -v /vendor/ | grep -v examples))
 
 if [[ -n ${err_files} ]]; then
  echo 'Unchecked errors found in the following places:'