Guard unsafe imports behind !appengine

"unsafe" (in this case, imported via "golang.org/x/sys/unix") cannot be used on AppEngine, so we need to add the "!appengine" build constraint to files that use it (namely a few terminal_check_*.go). Fixes sirupsen#947.
Hexcles · Apr 11, 2019 · a0dcfa3 · a0dcfa3
1 parent 9b3cdde
commit a0dcfa3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/terminal_check_bsd.go b/terminal_check_bsd.go
@@ -1,4 +1,5 @@
 // +build darwin dragonfly freebsd netbsd openbsd
+// +build !appengine
 
 package logrus
 
@@ -10,4 +11,3 @@ func isTerminal(fd int) bool {
 	_, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
 	return err == nil
 }
-
diff --git a/terminal_check_solaris.go b/terminal_check_solaris.go
@@ -1,3 +1,6 @@
+// +build solaris
+// +build !appengine
+
 package logrus
 
 import (

diff --git a/terminal_check_unix.go b/terminal_check_unix.go
@@ -1,4 +1,5 @@
 // +build linux aix
+// +build !appengine
 
 package logrus
 
@@ -10,4 +11,3 @@ func isTerminal(fd int) bool {
 	_, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
 	return err == nil
 }
-
diff --git a/terminal_check_windows.go b/terminal_check_windows.go
@@ -1,4 +1,4 @@
-// +build !appengine,!js,windows
+// +build windows
 
 package logrus