Merge pull request #1192 from iost-official/fix/sigtrap

fix sig trap
iost-official · May 27, 2021 · f703a93 · f703a93
2 parents 56ae3cd + 39ad9ba
commit f703a93
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 145 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -40,9 +40,7 @@ linters:
     - goimports
     - gomodguard
     - goprintffuncname
-    - interfacer
     - rowserrcheck
-    - scopelint
     - testpackage
     - whitespace
   disable:

diff --git a/go.mod b/go.mod
@@ -63,6 +63,7 @@ require (
 	golang.org/x/mod v0.4.1 // indirect
 	golang.org/x/net v0.0.0-20201021035429-f5854403a974
 	golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46 // indirect
+	golang.org/x/term v0.0.0-20210503060354-a79de5458b56
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 	golang.org/x/tools v0.1.0 // indirect
 	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013

diff --git a/go.sum b/go.sum
@@ -713,11 +713,14 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46 h1:V066+OYJ66oTjnhm4Yrn7SXIwSCiDQJxpBxmvqb1N1c=
 golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/term v0.0.0-20210503060354-a79de5458b56 h1:b8jxX3zqjpqb2LklXPzKSGJhzyxCOZSz8ncv8Nv+y7w=
+golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

diff --git a/ilog/console_writer.go b/ilog/console_writer.go
@@ -3,8 +3,6 @@ package ilog
 import (
 	"fmt"
 	"os"
-
-	"golang.org/x/crypto/ssh/terminal"
 )
 
 var _ LogWriter = &ConsoleWriter{}
@@ -21,8 +19,12 @@ type ConsoleWriter struct {
 
 // NewConsoleWriter returns a new instance of ConsoleWriter.
 func NewConsoleWriter() *ConsoleWriter {
+	colorful := false
+	if fileInfo, _ := os.Stdout.Stat(); (fileInfo.Mode() & os.ModeCharDevice) != 0 {
+		colorful = true
+	}
 	return &ConsoleWriter{
-		colorful: terminal.IsTerminal(int(os.Stdout.Fd())),
+		colorful: colorful,
 	}
 }
 

diff --git a/vendor/golang.org/x/term/README.md b/vendor/golang.org/x/term/README.md
diff --git a/vendor/golang.org/x/term/go.mod b/vendor/golang.org/x/term/go.mod
diff --git a/vendor/golang.org/x/term/go.sum b/vendor/golang.org/x/term/go.sum
diff --git a/vendor/golang.org/x/term/term.go b/vendor/golang.org/x/term/term.go
diff --git a/vendor/golang.org/x/term/term_solaris.go b/vendor/golang.org/x/term/term_solaris.go
diff --git a/vendor/golang.org/x/term/term_unix.go b/vendor/golang.org/x/term/term_unix.go
diff --git a/vendor/golang.org/x/term/term_unix_bsd.go b/vendor/golang.org/x/term/term_unix_bsd.go
diff --git a/vendor/golang.org/x/term/term_unix_linux.go b/vendor/golang.org/x/term/term_unix_linux.go
diff --git a/vendor/golang.org/x/term/term_unix_aix.go → vendor/golang.org/x/term/term_unix_other.go b/vendor/golang.org/x/term/term_unix_aix.go → vendor/golang.org/x/term/term_unix_other.go
diff --git a/vendor/golang.org/x/term/term_unix_zos.go b/vendor/golang.org/x/term/term_unix_zos.go
diff --git a/vendor/golang.org/x/term/term_unsupported.go b/vendor/golang.org/x/term/term_unsupported.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -465,7 +465,8 @@ golang.org/x/sys/internal/unsafeheader
 golang.org/x/sys/plan9
 golang.org/x/sys/unix
 golang.org/x/sys/windows
-# golang.org/x/term v0.0.0-20201117132131-f5c789dd3221
+# golang.org/x/term v0.0.0-20210503060354-a79de5458b56
+## explicit
 golang.org/x/term
 # golang.org/x/text v0.3.3
 golang.org/x/text/encoding