From: Tobias Schmidt <ts@soundcloud.com>
Date: Sat, 4 Mar 2017 02:52:29 +0000 (-0400)
Subject: Fix code formatting (#120)
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2a62478d80fe79b61f28fcd67acd9f6ba1a7262c;p=blackbox_exporter.git

Fix code formatting (#120)

* Fix code formatting

* Ensure CI fails on unformatted code
---

diff --git a/.travis.yml b/.travis.yml
index 24225ea..9945a4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ sudo: false
 language: go
 
 go:
-- 1.5.4
-- 1.6.2
+- 1.7.5
+- 1.8
 
 script:
 - make
diff --git a/Makefile b/Makefile
index ffbad58..0b26c36 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ DOCKER_IMAGE_NAME       ?= blackbox-exporter
 DOCKER_IMAGE_TAG        ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))
 
 
-all: format build test
+all: style build test
 
 style:
 	@echo ">> checking code style"
diff --git a/http.go b/http.go
index 63aa266..fdf3098 100644
--- a/http.go
+++ b/http.go
@@ -123,9 +123,9 @@ func probeHTTP(target string, w http.ResponseWriter, module Module) (success boo
 		return net.Dial(dialProtocol, address)
 	}
 	client.Transport = &http.Transport{
-		TLSClientConfig: tlsconfig,
-		Dial:            dial,
-		Proxy:           http.ProxyFromEnvironment,
+		TLSClientConfig:   tlsconfig,
+		Dial:              dial,
+		Proxy:             http.ProxyFromEnvironment,
 		DisableKeepAlives: true,
 	}