瀏覽代碼

build: Enable gometalinter "staticcheck" check

Jakob Borg 8 年之前
父節點
當前提交
744c2e82b5
共有 4 個文件被更改,包括 6 次插入2 次删除
  1. 2 0
      build.go
  2. 1 1
      cmd/strelaysrv/status.go
  3. 1 1
      lib/model/rwfolder.go
  4. 2 0
      lib/sync/sync_test.go

+ 2 - 0
build.go

@@ -300,6 +300,7 @@ func runCommand(cmd string, target target) {
 			ok = gometalinter("varcheck", dirs) && ok
 			ok = gometalinter("ineffassign", dirs) && ok
 			ok = gometalinter("unused", dirs) && ok
+			ok = gometalinter("staticcheck", dirs) && ok
 			if !ok {
 				os.Exit(1)
 			}
@@ -370,6 +371,7 @@ func setup() {
 		"github.com/tsenart/deadcode",
 		"golang.org/x/net/html",
 		"golang.org/x/tools/cmd/cover",
+		"honnef.co/go/staticcheck/cmd/staticcheck",
 		"honnef.co/go/unused/cmd/unused",
 	}
 	for _, pkg := range packages {

+ 1 - 1
cmd/strelaysrv/status.go

@@ -42,7 +42,7 @@ func getStatus(w http.ResponseWriter, r *http.Request) {
 	status["goMaxProcs"] = runtime.GOMAXPROCS(-1)
 	status["goNumRoutine"] = runtime.NumGoroutine()
 	status["kbps10s1m5m15m30m60m"] = []int64{
-		rc.rate(10/10) * 8 / 1000,
+		rc.rate(1) * 8 / 1000, // each interval is 10s
 		rc.rate(60/10) * 8 / 1000,
 		rc.rate(5*60/10) * 8 / 1000,
 		rc.rate(15*60/10) * 8 / 1000,

+ 1 - 1
lib/model/rwfolder.go

@@ -494,7 +494,7 @@ nextFile:
 		select {
 		case <-f.stop:
 			// Stop processing files if the puller has been told to stop.
-			break
+			break nextFile
 		default:
 		}
 

+ 2 - 0
lib/sync/sync_test.go

@@ -157,6 +157,7 @@ func TestRWMutex(t *testing.T) {
 	}()
 
 	mut.Lock()
+	_ = 1 // skip empty critical section check
 	mut.Unlock()
 
 	if len(messages) != 2 {
@@ -170,6 +171,7 @@ func TestRWMutex(t *testing.T) {
 	mut.RLock()
 	mut.RLock()
 	mut.RLock()
+	_ = 1 // skip empty critical section check
 	mut.RUnlock()
 	mut.RUnlock()
 	mut.RUnlock()