From 548916e902fc8ad782feaed785cd1272b47b6164 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Wed, 21 Feb 2018 15:04:58 +0800
Subject: [PATCH] run gometalinter with go vet

---
 .gometalinter.json | 12 ++++++++++++
 .travis.yml        |  1 +
 .travis/script.sh  |  6 ++++++
 server.go          |  2 +-
 server_tls.go      |  2 +-
 5 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 .gometalinter.json

diff --git a/.gometalinter.json b/.gometalinter.json
new file mode 100644
index 00000000..88de3575
--- /dev/null
+++ b/.gometalinter.json
@@ -0,0 +1,12 @@
+{
+  "DisableAll": true,
+  "Exclude": [
+    "vendor"
+  ],
+  "Enable": [
+    "vet"
+  ],
+  "Linters": {
+    "vet": "go tool vet -printfuncs=Infof,Debugf,Warningf,Errorf:PATH:LINE:MESSAGE"
+  }
+}
diff --git a/.travis.yml b/.travis.yml
index 824a91bb..672b3f6d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ env:
   global:
     - TIMESCALE_FACTOR=20
   matrix:
+    - TRAVIS_GOARCH=amd64 TESTMODE=lint
     - TRAVIS_GOARCH=amd64 TESTMODE=unit
     - TRAVIS_GOARCH=amd64 TESTMODE=integration
     - TRAVIS_GOARCH=386 TESTMODE=unit
diff --git a/.travis/script.sh b/.travis/script.sh
index e244d8f2..3d0a2d74 100755
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -3,6 +3,12 @@
 set -ex
 
 go get -t ./...
+if [ ${TESTMODE} == "lint" ]; then 
+  go get github.com/alecthomas/gometalinter
+  gometalinter --install
+  gometalinter --tests ./...
+fi
+
 if [ ${TESTMODE} == "unit" ]; then
   ginkgo -r -v -cover -randomizeAllSpecs -randomizeSuites -trace -skipPackage integrationtests,benchmark
 fi
diff --git a/server.go b/server.go
index 53d56a4c..67154dd2 100644
--- a/server.go
+++ b/server.go
@@ -323,7 +323,7 @@ func (s *server) handlePacket(pconn net.PacketConn, remoteAddr net.Addr, packet
 			var pr *wire.PublicReset
 			pr, err = wire.ParsePublicReset(r)
 			if err != nil {
-				utils.Infof("Received a Public Reset for connection %x. An error occurred parsing the packet.")
+				utils.Infof("Received a Public Reset for connection %x. An error occurred parsing the packet.", hdr.ConnectionID)
 			} else {
 				utils.Infof("Received a Public Reset for connection %x, rejected packet number: 0x%x.", hdr.ConnectionID, pr.RejectedPacketNumber)
 			}
diff --git a/server_tls.go b/server_tls.go
index a3b63d83..53a40ba9 100644
--- a/server_tls.go
+++ b/server_tls.go
@@ -148,7 +148,7 @@ func (s *serverTLS) handleInitialImpl(remoteAddr net.Addr, hdr *wire.Header, dat
 	sess, err := s.handleUnpackedInitial(remoteAddr, hdr, frame, aead)
 	if err != nil {
 		if ccerr := s.sendConnectionClose(remoteAddr, hdr, aead, err); ccerr != nil {
-			utils.Debugf("Error sending CONNECTION_CLOSE: ", ccerr)
+			utils.Debugf("Error sending CONNECTION_CLOSE: %s", ccerr)
 		}
 		return nil, err
 	}