From da24f3e6e0c78fb6ea803ab99bac5e557735a01d Mon Sep 17 00:00:00 2001
From: Antoine Leroyer <aleroyer@deezer.com>
Date: Fri, 3 Apr 2020 18:29:43 +0200
Subject: [PATCH] Linting, removing non-used variables and removed travis-ci
---
.travis.yml | 10 ----------
dyn_stat_test.go | 2 +-
dynafile_cache_test.go | 2 +-
go.mod | 2 +-
point.go | 6 ------
pointstore.go | 6 +++---
pointstore_test.go | 2 +-
7 files changed, 7 insertions(+), 23 deletions(-)
delete mode 100644 .travis.yml
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index c095a51..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-language: go
-
-go:
- - 1.4
-
-install:
- - go get github.com/digitalocean/rsyslog_exporter
-
-script:
- - make test
diff --git a/dyn_stat_test.go b/dyn_stat_test.go
index 8d7ff84..d96bea5 100644
--- a/dyn_stat_test.go
+++ b/dyn_stat_test.go
@@ -79,7 +79,7 @@ func TestDynStatToPoints(t *testing.T) {
}
seen := map[string]bool{}
- for name, _ := range wants {
+ for name := range wants {
seen[name] = false
}
diff --git a/dynafile_cache_test.go b/dynafile_cache_test.go
index 970abf6..a7cd762 100644
--- a/dynafile_cache_test.go
+++ b/dynafile_cache_test.go
@@ -104,7 +104,7 @@ func TestDynafileCacheToPoints(t *testing.T) {
}
seen := map[string]bool{}
- for name, _ := range wants {
+ for name := range wants {
seen[name] = false
}
diff --git a/go.mod b/go.mod
index 6090a9c..6007585 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/soundcloud/rsyslog_exporter
+module github.com/aleroyer/rsyslog_exporter
go 1.13
diff --git a/point.go b/point.go
index 499cfc2..1f44118 100644
--- a/point.go
+++ b/point.go
@@ -1,7 +1,6 @@
package main
import (
- "errors"
"fmt"
"github.com/prometheus/client_golang/prometheus"
@@ -14,11 +13,6 @@ const (
gauge
)
-var (
- ErrIncompatiblePointType = errors.New("incompatible point type")
- ErrUnknownPointType = errors.New("unknown point type")
-)
-
type point struct {
Name string
Description string
diff --git a/pointstore.go b/pointstore.go
index 3da93df..632a46b 100644
--- a/pointstore.go
+++ b/pointstore.go
@@ -7,7 +7,7 @@ import (
)
var (
- ErrPointNotFound = errors.New("point does not exist")
+ errPointNotFound = errors.New("point does not exist")
)
type pointStore struct {
@@ -25,7 +25,7 @@ func newPointStore() *pointStore {
func (ps *pointStore) keys() []string {
ps.lock.Lock()
keys := make([]string, 0)
- for k, _ := range ps.pointMap {
+ for k := range ps.pointMap {
keys = append(keys, k)
}
sort.Strings(keys)
@@ -48,5 +48,5 @@ func (ps *pointStore) get(name string) (*point, error) {
return p, nil
}
ps.lock.Unlock()
- return &point{}, ErrPointNotFound
+ return &point{}, errPointNotFound
}
diff --git a/pointstore_test.go b/pointstore_test.go
index ad7afcb..39f0919 100644
--- a/pointstore_test.go
+++ b/pointstore_test.go
@@ -86,7 +86,7 @@ func TestPointStore(t *testing.T) {
}
_, err = ps.get("no point")
- if err != ErrPointNotFound {
+ if err != errPointNotFound {
t.Error("getting non existent point should raise error")
}
}
--
GitLab