Merge pull request #5 from ofesseler/dev

changed to promu build
ofesseler · Dec 5, 2016 · 7393670 · 7393670
2 parents e0f75e7 + b821d9f
commit 7393670
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -9,11 +9,12 @@ info:
 	@echo "gotest: run go tests and reformats"
 
 build: gotest
-	$(GO) build -o gluster_exporter
+	$(PROMU) build
+	#$(GO) build -o gluster_exporter
 
 docker: gotest build
 	docker build -t gluster-exporter-test .
-	docker run --rm --privileged=true -p 9189:9189 -p 24007:24007 -p 24008:24008 -ti -v gluster-test:/data gluster-exporter-test
+	docker run --rm --privileged=true -p 9189:9189 -p 24007:24007 -p 24008:24008 -i -v gluster-test:/data gluster-exporter-test
 
 gotest: fmt
 	$(GO) test -v $(pkgs)

diff --git a/gluster_client.go b/gluster_client.go
@@ -2,9 +2,10 @@ package main
 
 import (
 	"bytes"
+	"os/exec"
+
 	"github.com/ofesseler/gluster_exporter/structs"
 	"github.com/prometheus/common/log"
-	"os/exec"
 )
 
 func execGlusterCommand(arg ...string) *bytes.Buffer {

diff --git a/main.go b/main.go
@@ -19,12 +19,13 @@ import (
 	"net/http"
 
 	"fmt"
+	"os"
+	"strings"
+
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/prometheus/common/log"
 	"github.com/prometheus/common/version"
-	"os"
-	"strings"
 )
 
 const (