1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-10 18:00:43 +00:00

adjust lint settings

This commit is contained in:
Darien Raymond 2018-05-26 00:47:51 +02:00
parent be6f44e1d7
commit 483a56c847
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
5 changed files with 11 additions and 10 deletions

View File

@ -4,7 +4,11 @@
"go.lintTool": "gometalinter",
"go.lintFlags": [
"--enable-gc"
"--enable-gc",
"--no-config",
"--exclude=.*\\.pb\\.go",
"--concurrency=2",
"--disable=gas"
],
"go.formatTool": "goimports",

View File

@ -21,9 +21,9 @@ func (l *OutboundListener) add(conn net.Conn) {
select {
case l.buffer <- conn:
case <-l.done.Wait():
common.Ignore(conn.Close(), "We can do nothing if Close() returns error.")
conn.Close() // nolint: errcheck
default:
common.Ignore(conn.Close(), "We can do nothing if Close() returns error.")
conn.Close() // nolint: errcheck
}
}
@ -44,7 +44,7 @@ L:
for {
select {
case c := <-l.buffer:
common.Ignore(c.Close(), "We can do nothing if errored.")
c.Close() // nolint: errcheck
default:
break L
}

View File

@ -138,10 +138,10 @@ func (g *Instance) Close() error {
g.active = false
common.Ignore(common.Close(g.accessLogger), "Recycling it anyway")
common.Close(g.accessLogger) // nolint: errcheck
g.accessLogger = nil
common.Ignore(common.Close(g.errorLogger), "Recycling this too")
common.Close(g.errorLogger) // nolint: errcheck
g.errorLogger = nil
return nil

View File

@ -21,6 +21,3 @@ func Must2(v interface{}, err error) interface{} {
func Error2(v interface{}, err error) error {
return err
}
// Ignore an error with reason, for lint purpose.
func Ignore(err error, reason string) {}

View File

@ -176,7 +176,7 @@ func (s *ServerSession) DecodeRequestHeader(reader io.Reader) (*protocol.Request
if invalidRequestErr != nil {
randomLen := dice.Roll(64) + 1
// Read random number of bytes for prevent detection.
common.Ignore(buffer.AppendSupplier(buf.ReadFullFrom(decryptor, int32(randomLen))), "Error doesn't matter")
buffer.AppendSupplier(buf.ReadFullFrom(decryptor, int32(randomLen))) // nolint: errcheck
}
}()