Merge pull request #969 from sirupsen/plan9_build

dgsb · web-flow · commit cfb9d25dff21 · 2019-05-18T12:33:47.000+02:00
fix build break for plan9
diff --git a/go.sum b/go.sum
@@ -2,6 +2,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe h1:CHRGQ8V7OlCYtwaKPJi3iA7J+YdNKdo8j7nG5IgDhjs=
 github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
diff --git a/terminal_check_nacl.go b/terminal_check_nacl.go
diff --git a/terminal_check_no_terminal.go b/terminal_check_no_terminal.go
@@ -1,4 +1,4 @@
-// +build js
+// +build js nacl plan9
 
 package logrus
 
diff --git a/terminal_check_notappengine.go b/terminal_check_notappengine.go
@@ -1,4 +1,4 @@
-// +build !appengine,!js,!windows,!nacl
+// +build !appengine,!js,!windows,!nacl,!plan9
 
 package logrus
 
diff --git a/terminal_check_windows.go b/terminal_check_windows.go
@@ -6,15 +6,29 @@ import (
 	"io"
 	"os"
 	"syscall"
+
+	sequences "github.com/konsorten/go-windows-terminal-sequences"
 )
 
+func initTerminal(w io.Writer) {
+	switch v := w.(type) {
+	case *os.File:
+		sequences.EnableVirtualTerminalProcessing(syscall.Handle(v.Fd()), true)
+	}
+}
+
 func checkIfTerminal(w io.Writer) bool {
+	var ret bool
 	switch v := w.(type) {
 	case *os.File:
 		var mode uint32
 		err := syscall.GetConsoleMode(syscall.Handle(v.Fd()), &mode)
-		return err == nil
+		ret = (err == nil)
 	default:
-		return false
+		ret = false
+	}
+	if ret {
+		initTerminal(w)
 	}
+	return ret
 }
diff --git a/terminal_notwindows.go b/terminal_notwindows.go
diff --git a/terminal_windows.go b/terminal_windows.go
diff --git a/text_formatter.go b/text_formatter.go
@@ -84,10 +84,6 @@ type TextFormatter struct {
 func (f *TextFormatter) init(entry *Entry) {
 	if entry.Logger != nil {
 		f.isTerminal = checkIfTerminal(entry.Logger.Out)
-
-		if f.isTerminal {
-			initTerminal(entry.Logger.Out)
-		}
 	}
 }
 
diff --git a/travis/cross_build.sh b/travis/cross_build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 if [[ "$TRAVIS_GO_VERSION" =~ ^1.\12\. ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    /tmp/gox/gox -build-lib -all -os '!plan9 !nacl'
+    /tmp/gox/gox -build-lib -all
 fi

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build js`
	`1`	`+// +build js nacl plan9`
`2`	`2`
`3`	`3`	`package logrus`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build !appengine,!js,!windows,!nacl`
	`1`	`+// +build !appengine,!js,!windows,!nacl,!plan9`
`2`	`2`
`3`	`3`	`package logrus`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -84,10 +84,6 @@ type TextFormatter struct {`
`84`	`84`	`func (f TextFormatter) init(entry Entry) {`
`85`	`85`	`if entry.Logger != nil {`
`86`	`86`	`f.isTerminal = checkIfTerminal(entry.Logger.Out)`
`87`		`-`
`88`		`- if f.isTerminal {`
`89`		`- initTerminal(entry.Logger.Out)`
`90`		`- }`
`91`	`87`	`}`
`92`	`88`	`}`
`93`	`89`