linter

Author: nikandfor

.github/workflows/golangci-lint.yml

@@ -7,12 +7,12 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v7
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.63.4
+          version: v2.1
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
@@ -22,3 +22,21 @@ jobs:
 
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true
+      #
+      - name: golangci-lint cmd/tlog
+        uses: golangci/golangci-lint-action@v7
+        with:
+          version: v2.1
+          working-directory: cmd/tlog
+
+      - name: golangci-lint ext/tlclick
+        uses: golangci/golangci-lint-action@v7
+        with:
+          version: v2.1
+          working-directory: cmd/tlclick
+
+      - name: golangci-lint ext/tlgin
+        uses: golangci/golangci-lint-action@v7
+        with:
+          version: v2.1
+          working-directory: cmd/tlgin

.golangci.yml

@@ -1,110 +1,31 @@
-run:
-  #modules-download-mode: readonly
-linters-settings:
-  govet:
-    check-shadowing: false
-  golint:
-    min-confidence: 0
-  gocognit:
-    min-complexity: 30
-  cyclop:
-    max-complexity: 30
-  fieldalignment:
-    suggest-new: true
-  dupl:
-    threshold: 100
-  goconst:
-    min-len: 2
-    min-occurrences: 3
-  gosec:
-    excludes:
-      - G108
-      - G114
-      - G115
-  revive:
-    rules:
-      - name: unused-parameter
-        disabled: true
-  depguard:
-    rules:
-      main:
-        allow:
-          - $gostd
-          - github.com/fsnotify/fsnotify
-          - github.com/getsentry/sentry-go
-          - github.com/gin-gonic/gin
-          - github.com/nikandfor/assert
-          - github.com/opentracing/opentracing-go
-          - github.com/prometheus/client_golang
-          - github.com/prometheus/client_model
-          - github.com/stretchr/testify/assert
-          - github.com/stretchr/testify/require
-          - go.opentelemetry.io/otel
-          - golang.org/x
-          - nikand.dev/go/cbor
-          - nikand.dev/go/cli
-          - nikand.dev/go/graceful
-          - nikand.dev/go/hacked
-          - tlog.app/go/eazy
-          - tlog.app/go/errors
-          - tlog.app/go/loc
-          - tlog.app/go/tlog
-  misspell:
-  lll:
-    line-length: 170
-  goimports:
-    local-prefixes: github.com/nikandfor/tlog
-  prealloc:
-    simple: true
-    for-loops: true
-  gocritic:
-    enabled-tags:
-      - experimental
-      - performance
-      - style
-    disabled-checks:
-      - appendAssign
-      - appendCombine
-      - builtinShadow
-      - commentedOutCode
-      - octalLiteral
-      - unnamedResult
-      - whyNoLint
-      - yodaStyleExpr
-
+version: "2"
 linters:
-  enable-all: true
+  default: all
   disable:
     - cyclop
     - dogsled
     - err113
     - exhaustive
-    - exhaustivestruct
     - exhaustruct
     - forcetypeassert
+    - funcorder
     - funlen
-    - gci
     - gochecknoglobals
     - gochecknoinits
     - gocognit
     - goconst
     - gocyclo
     - godox
-    - golint
-    - gomnd
     - gosmopolitan
-    - ifshort
     - inamedparam
     - ireturn
     - lll
     - maintidx
-    - maligned
     - mnd
     - nakedret
     - nestif
     - nlreturn
     - nonamedreturns
-    - nosnakecase
     - paralleltest
     - prealloc
     - predeclared
@@ -113,8 +34,96 @@ linters:
     - testifylint
     - testpackage
     - thelper
-    - typecheck
     - unparam
     - varnamelen
     - wrapcheck
     - wsl
+  settings:
+    cyclop:
+      max-complexity: 30
+    depguard:
+      rules:
+        main:
+          allow:
+            - $gostd
+            - github.com/ClickHouse/ch-go
+            - github.com/fsnotify/fsnotify
+            - github.com/getsentry/sentry-go
+            - github.com/gin-gonic/gin
+            - github.com/nikandfor/assert
+            - github.com/opentracing/opentracing-go
+            - github.com/prometheus/client_golang
+            - github.com/prometheus/client_model
+            - github.com/stretchr/testify/assert
+            - github.com/stretchr/testify/require
+            - go.opentelemetry.io/otel
+            - golang.org/x
+            - nikand.dev/go/cbor
+            - nikand.dev/go/cli
+            - nikand.dev/go/graceful
+            - nikand.dev/go/hacked
+            - tlog.app/go/eazy
+            - tlog.app/go/errors
+            - tlog.app/go/loc
+            - tlog.app/go/tlog
+    dupl:
+      threshold: 100
+    gocognit:
+      min-complexity: 30
+    goconst:
+      min-len: 2
+      min-occurrences: 3
+    gocritic:
+      disabled-checks:
+        - appendAssign
+        - appendCombine
+        - builtinShadow
+        - commentedOutCode
+        - octalLiteral
+        - unnamedResult
+        - whyNoLint
+        - yodaStyleExpr
+      enabled-tags:
+        - experimental
+        - performance
+        - style
+    gosec:
+      excludes:
+        - G108
+        - G114
+        - G115
+    lll:
+      line-length: 170
+    prealloc:
+      simple: true
+      for-loops: true
+    revive:
+      rules:
+        - name: unused-parameter
+          disabled: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/nikandfor/tlog
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

cmd/tlog/tlogcmd/main.go

@@ -3,7 +3,6 @@ package tlogcmd
 import (
 	"context"
 	"io"
-	"io/fs"
 	"net"
 	"net/http"
 	_ "net/http/pprof"
@@ -39,11 +38,6 @@ type (
 	perrWriter struct {
 		io.WriteCloser
 	}
-
-	listenerClose struct {
-		net.Listener
-		def []io.Closer
-	}
 )
 
 func App() *cli.Command {
@@ -306,8 +300,8 @@ func agentRun(c *cli.Command) (err error) {
 			return errors.Wrap(err, "listen %v", host)
 		}
 
-		switch {
-		case u.Scheme == "unix", u.Scheme == "tcp":
+		switch u.Scheme {
+		case "unix", "tcp":
 			group.Add(func(ctx context.Context) error {
 				var wg sync.WaitGroup
 
@@ -333,7 +327,7 @@ func agentRun(c *cli.Command) (err error) {
 
 						defer tr.Finish("err", &err)
 
-						defer closeWrap(c, &err, "close conn")
+						defer closer(c, &err, "close conn")
 
 						if f, ok := a.(tlio.Flusher); ok {
 							defer doWrap(f.Flush, &err, "flush db")
@@ -347,7 +341,7 @@ func agentRun(c *cli.Command) (err error) {
 			}, graceful.WithStop(func(ctx context.Context) error {
 				return l.Close()
 			}))
-		case u.Scheme == "unixgram", u.Scheme == "udp":
+		case "unixgram", "udp":
 			group.Add(func(ctx context.Context) error {
 				buf := make([]byte, 0x1000)
 
@@ -385,7 +379,7 @@ func cat(c *cli.Command) (err error) {
 		tlflag.Describe(tlog.Root(), w)
 	}
 
-	var fs *fsnotify.Watcher //nolint:gocritic
+	var fs *fsnotify.Watcher
 
 	if c.Bool("follow") {
 		fs, err = fsnotify.NewWatcher()
@@ -716,26 +710,6 @@ func (w perrWriter) Close() (err error) {
 	return
 }
 
-func isDir(name string) bool {
-	inf, err := os.Stat(name)
-	if err != nil {
-		return false
-	}
-
-	return inf.IsDir()
-}
-
-func isFifo(name string) bool {
-	inf, err := os.Stat(name)
-	if err != nil {
-		return false
-	}
-
-	mode := inf.Mode()
-
-	return mode&fs.ModeNamedPipe != 0
-}
-
 func listen(netw, addr string) (l net.Listener, p net.PacketConn, err error) {
 	switch netw {
 	case "unix", "unixgram":
@@ -767,44 +741,13 @@ func listen(netw, addr string) (l net.Listener, p net.PacketConn, err error) {
 	return l, p, nil
 }
 
-func (p listenerClose) SetDeadline(t time.Time) error {
-	return p.Listener.(interface{ SetDeadline(time.Time) error }).SetDeadline(t)
-}
-
-func (p listenerClose) Close() (err error) {
-	err = p.Listener.Close()
-
-	for i := len(p.def) - 1; i >= 0; i-- {
-		e := p.def[i].Close()
-		if err == nil {
-			err = e
-		}
-	}
-
-	return
-}
-
-func closeWrap(c io.Closer, errp *error, msg string) {
+func closer(c io.Closer, errp *error, msg string) { //nolint:gocritic
 	doWrap(c.Close, errp, msg)
 }
 
-func flushWrap(x interface{}, errp *error, msg string) {
-	if f, ok := x.(tlio.Flusher); ok {
-		doWrap(f.Flush, errp, msg)
-	}
-}
-
-func doWrap(f func() error, errp *error, msg string) {
-	e := f()
-	if *errp == nil {
-		*errp = errors.Wrap(e, msg)
-	}
-}
-
-func closeIfErr(c io.Closer, errp *error) {
+func doWrap(f func() error, errp *error, msg string) { //nolint:gocritic
+	err := f()
 	if *errp == nil {
-		return
+		*errp = errors.Wrap(err, msg)
 	}
-
-	_ = c.Close()
 }