Fix staticcheck errors.

diff --git a/main.go b/main.go
index 38ff7bda5a63c19ffeb437d3124d1252231991f8..164597640f262d8d1de88dce42d2e618b8696d6b 100644 (file)
--- a/main.go
+++ b/main.go
@@ -190,7 +190,7 @@ func main() {
                                http.Error(w, fmt.Sprintf("failed to reload config: %s", err), http.StatusInternalServerError)
                        }
                })
-       http.Handle("/metrics", prometheus.Handler())
+       http.Handle("/metrics", promhttp.Handler())
        http.HandleFunc("/probe", func(w http.ResponseWriter, r *http.Request) {
                sc.Lock()
                conf := sc.C

diff --git a/tcp_test.go b/tcp_test.go
index 37a324196efdebcfb22980fce5dc7562725fcfd8..a612317f0005ff56e71b8e8af5a3ee8b301bc535 100644 (file)
--- a/tcp_test.go
+++ b/tcp_test.go
@@ -35,7 +35,7 @@ func TestTCPConnection(t *testing.T) {
        go func() {
                conn, err := ln.Accept()
                if err != nil {
-                       t.Fatalf("Error accepting on socket: %s", err)
+                       panic(fmt.Sprintf("Error accepting on socket: %s", err))
                }
                conn.Close()
                ch <- struct{}{}
@@ -83,7 +83,7 @@ func TestTCPConnectionQueryResponseIRC(t *testing.T) {
        go func() {
                conn, err := ln.Accept()
                if err != nil {
-                       t.Fatalf("Error accepting on socket: %s", err)
+                       panic(fmt.Sprintf("Error accepting on socket: %s", err))
                }
                fmt.Fprintf(conn, ":ircd.localhost NOTICE AUTH :*** Looking up your hostname...\n")
                var nick, user, mode, unused, realname string
@@ -102,7 +102,7 @@ func TestTCPConnectionQueryResponseIRC(t *testing.T) {
        go func() {
                conn, err := ln.Accept()
                if err != nil {
-                       t.Fatalf("Error accepting on socket: %s", err)
+                       panic(fmt.Sprintf("Error accepting on socket: %s", err))
                }
                fmt.Fprintf(conn, ":ircd.localhost NOTICE AUTH :*** Looking up your hostname...\n")
                var nick, user, mode, unused, realname string
@@ -152,7 +152,7 @@ func TestTCPConnectionQueryResponseMatching(t *testing.T) {
        go func() {
                conn, err := ln.Accept()
                if err != nil {
-                       t.Fatalf("Error accepting on socket: %s", err)
+                       panic(fmt.Sprintf("Error accepting on socket: %s", err))
                }
                conn.SetDeadline(time.Now().Add(1 * time.Second))
                fmt.Fprintf(conn, "SSH-2.0-OpenSSH_6.9p1 Debian-2\n")
@@ -334,7 +334,7 @@ func TestPrometheusTimeoutTCP(t *testing.T) {
        go func() {
                conn, err := ln.Accept()
                if err != nil {
-                       t.Fatalf("Error accepting on socket: %s", err)
+                       panic(fmt.Sprintf("Error accepting on socket: %s", err))
                }
                conn.Close()
                ch <- struct{}{}