mirror of
https://github.com/go-kratos/kratos.git
synced 2024-12-24 20:14:48 +02:00
fix: fix errors reported by Lint CI. (#3435)
* fix: fix errors reported by Lint CI. * fix error reported by golangLintCI * update field name to server. aviod copyloopvar check. * fix lint problem.
This commit is contained in:
parent
5b5c253d83
commit
7cd86eb077
5
.github/workflows/lint.yml
vendored
5
.github/workflows/lint.yml
vendored
@ -31,6 +31,5 @@ jobs:
|
||||
- name: Lint
|
||||
uses: golangci/golangci-lint-action@v6
|
||||
with:
|
||||
version: v1.60.3
|
||||
working-directory: ${{ matrix.workdir }}
|
||||
skip-pkg-cache: true
|
||||
version: v1.61.0
|
||||
working-directory: ${{ matrix.workdir }}
|
@ -10,8 +10,9 @@ linters:
|
||||
- dogsled
|
||||
- durationcheck
|
||||
- errcheck
|
||||
- exportloopref
|
||||
# - copyloopvar # need upgrade to Go 1.22
|
||||
- govet
|
||||
- staticcheck
|
||||
- gosimple
|
||||
- gofmt
|
||||
- gofumpt
|
||||
@ -49,7 +50,8 @@ linters:
|
||||
|
||||
linters-settings:
|
||||
govet:
|
||||
check-shadowing: true
|
||||
enable:
|
||||
- shadow
|
||||
whitespace:
|
||||
multi-func: true
|
||||
lll:
|
||||
|
6
app.go
6
app.go
@ -99,17 +99,17 @@ func (a *App) Run() error {
|
||||
}
|
||||
}
|
||||
for _, srv := range a.opts.servers {
|
||||
srv := srv
|
||||
server := srv
|
||||
eg.Go(func() error {
|
||||
<-ctx.Done() // wait for stop signal
|
||||
stopCtx, cancel := context.WithTimeout(NewContext(a.opts.ctx, a), a.opts.stopTimeout)
|
||||
defer cancel()
|
||||
return srv.Stop(stopCtx)
|
||||
return server.Stop(stopCtx)
|
||||
})
|
||||
wg.Add(1)
|
||||
eg.Go(func() error {
|
||||
wg.Done() // here is to ensure server start has begun running before register, so defer is not needed
|
||||
return srv.Start(NewContext(a.opts.ctx, a))
|
||||
return server.Start(NewContext(a.opts.ctx, a))
|
||||
})
|
||||
}
|
||||
wg.Wait()
|
||||
|
@ -584,7 +584,7 @@ func TestRegistry_IdleAndWatch2(t *testing.T) {
|
||||
if err1 != nil {
|
||||
t.Error(err1)
|
||||
}
|
||||
go func(i int) {
|
||||
go func(_ int) {
|
||||
// first
|
||||
service, err2 := watch.Next()
|
||||
if (err2 != nil) != tt.wantErr {
|
||||
|
@ -254,7 +254,7 @@ func (w *wrappedClientStream) Context() context.Context {
|
||||
}
|
||||
|
||||
func (w *wrappedClientStream) SendMsg(m interface{}) error {
|
||||
h := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
h := func(_ context.Context, req interface{}) (interface{}, error) {
|
||||
return req, w.ClientStream.SendMsg(m)
|
||||
}
|
||||
|
||||
@ -272,7 +272,7 @@ func (w *wrappedClientStream) SendMsg(m interface{}) error {
|
||||
}
|
||||
|
||||
func (w *wrappedClientStream) RecvMsg(m interface{}) error {
|
||||
h := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
h := func(_ context.Context, req interface{}) (interface{}, error) {
|
||||
return req, w.ClientStream.RecvMsg(m)
|
||||
}
|
||||
|
||||
@ -305,7 +305,7 @@ func streamClientInterceptor(ms []middleware.Middleware, filters []selector.Node
|
||||
return nil, err
|
||||
}
|
||||
|
||||
h := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
h := func(_ context.Context, _ interface{}) (interface{}, error) {
|
||||
return streamer, nil
|
||||
}
|
||||
|
||||
|
@ -80,7 +80,7 @@ func (s *Server) streamServerInterceptor() grpc.StreamServerInterceptor {
|
||||
replyHeader: headerCarrier(replyHeader),
|
||||
})
|
||||
|
||||
h := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
h := func(_ context.Context, _ interface{}) (interface{}, error) {
|
||||
return handler(srv, ss), nil
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user