Просмотр исходного кода

fix: address staticcheck lint issues

- avoid deprecated DefaultIdleTimeout, use time.Minute directly
- simplify embedded field selectors (QF1008)
tags/v2.2.5^2^2
Alexey Dolotov 1 месяц назад
Родитель
Сommit
f355512aa6
3 измененных файлов: 5 добавлений и 4 удалений
  1. 2
    1
      internal/cli/run_proxy.go
  2. 2
    2
      mtglib/conns.go
  3. 1
    1
      mtglib/proxy_opts.go

+ 2
- 1
internal/cli/run_proxy.go Просмотреть файл

5
 	"fmt"
5
 	"fmt"
6
 	"net"
6
 	"net"
7
 	"os"
7
 	"os"
8
+	"time"
8
 
9
 
9
 	"github.com/9seconds/mtg/v2/antireplay"
10
 	"github.com/9seconds/mtg/v2/antireplay"
10
 	"github.com/9seconds/mtg/v2/events"
11
 	"github.com/9seconds/mtg/v2/events"
262
 
263
 
263
 		AllowFallbackOnUnknownDC: conf.AllowFallbackOnUnknownDC.Get(false),
264
 		AllowFallbackOnUnknownDC: conf.AllowFallbackOnUnknownDC.Get(false),
264
 		TolerateTimeSkewness:     conf.TolerateTimeSkewness.Value,
265
 		TolerateTimeSkewness:     conf.TolerateTimeSkewness.Value,
265
-		IdleTimeout:              conf.Network.Timeout.Idle.Get(mtglib.DefaultIdleTimeout),
266
+		IdleTimeout:              conf.Network.Timeout.Idle.Get(time.Minute),
266
 
267
 
267
 		DoppelGangerURLs:    doppelGangerURLs,
268
 		DoppelGangerURLs:    doppelGangerURLs,
268
 		DoppelGangerPerRaid: conf.Defense.Doppelganger.Repeats.Get(mtglib.DoppelGangerPerRaid),
269
 		DoppelGangerPerRaid: conf.Defense.Doppelganger.Repeats.Get(mtglib.DoppelGangerPerRaid),

+ 2
- 2
mtglib/conns.go Просмотреть файл

104
 }
104
 }
105
 
105
 
106
 func (c connIdleTimeout) Read(b []byte) (int, error) {
106
 func (c connIdleTimeout) Read(b []byte) (int, error) {
107
-	c.Conn.SetReadDeadline(time.Now().Add(c.timeout)) //nolint: errcheck
107
+	c.SetReadDeadline(time.Now().Add(c.timeout)) //nolint: errcheck
108
 
108
 
109
 	return c.Conn.Read(b) //nolint: wrapcheck
109
 	return c.Conn.Read(b) //nolint: wrapcheck
110
 }
110
 }
111
 
111
 
112
 func (c connIdleTimeout) Write(b []byte) (int, error) {
112
 func (c connIdleTimeout) Write(b []byte) (int, error) {
113
-	c.Conn.SetWriteDeadline(time.Now().Add(c.timeout)) //nolint: errcheck
113
+	c.SetWriteDeadline(time.Now().Add(c.timeout)) //nolint: errcheck
114
 
114
 
115
 	return c.Conn.Write(b) //nolint: wrapcheck
115
 	return c.Conn.Write(b) //nolint: wrapcheck
116
 }
116
 }

+ 1
- 1
mtglib/proxy_opts.go Просмотреть файл

218
 
218
 
219
 func (p ProxyOpts) getIdleTimeout() time.Duration {
219
 func (p ProxyOpts) getIdleTimeout() time.Duration {
220
 	if p.IdleTimeout == 0 {
220
 	if p.IdleTimeout == 0 {
221
-		return DefaultIdleTimeout
221
+		return time.Minute
222
 	}
222
 	}
223
 
223
 
224
 	return p.IdleTimeout
224
 	return p.IdleTimeout

Загрузка…
Отмена
Сохранить