Merge pull request #35 from mjtrangoni/fix-gometalinter

Fix build issue #34

.gometalinter.json

@@ -0,0 +1,8 @@
+{
+  "Cyclo": 40,
+  "Deadline": "6m",
+  "EnableGC": true,
+  "Exclude": ["Subprocess launching with variable", "Subprocess launched with variable", "Subprocess launching should be audited"],
+  "Sort": ["linter", "severity", "path", "line"],
+  "Vendor": true
+}

Gopkg.toml

@@ -1,8 +1,29 @@
-
+# Gopkg.toml example
 #
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
 # for detailed Gopkg.toml documentation.
 #
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
 
 [[constraint]]
   name = "github.com/prometheus/client_golang"
@@ -11,3 +32,11 @@
 [[constraint]]
   branch = "master"
   name = "github.com/prometheus/common"
+
+[[constraint]]
+  name = "gopkg.in/alecthomas/kingpin.v2"
+  version = "2.2.6"
+
+[prune]
+  go-tests = true
+  unused-packages = true

Makefile

@@ -4,7 +4,6 @@ pkgs         = $(shell $(GO) list ./... | grep -v /vendor/)
 PROMU        ?= $(GOPATH)/bin/promu
 GODEP        ?= $(GOPATH)/bin/dep
 GOLINTER     ?= $(GOPATH)/bin/gometalinter
-GOLINTOPS    ?= --vendor --deadline=6m --disable=gas --cyclo-over=40
 BIN_DIR      ?= $(shell pwd):x
 TARGET       ?= gluster_exporter
 
@@ -57,7 +56,7 @@ depcheck: $(GODEP)
 gometalinter: $(GOLINTER)
 	@echo ">> linting code"
 	@$(GOLINTER) --install > /dev/null
-	@$(GOLINTER) $(GOLINTOPS) ./...
+	@$(GOLINTER) --config=./.gometalinter.json ./...
 
 $(GOPATH)/bin/dep dep:
 	@GOOS=$(shell uname -s | tr A-Z a-z) \

gluster_client.go

@@ -148,7 +148,12 @@ func ExecVolumeHealInfo(volumeName string) (int, error) {
 
 	for _, brick := range healInfo.HealInfo.Bricks.Brick {
 		var count int
-		count, _ = strconv.Atoi(brick.NumberOfEntries)
+		var err error
+		count, err = strconv.Atoi(brick.NumberOfEntries)
+		if err != nil {
+			log.Error(err)
+			return -1, err
+		}
 		entriesOutOfSync += count
 	}
 	return entriesOutOfSync, nil