Merge pull request #943 from tandr/unexport-isterminal

Unexport IsTerminal
sirupsen · Apr 2, 2019 · 8fe117b · 8fe117b
2 parents a6c0064 + ede5b63
commit 8fe117b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/terminal/terminal_check_bsd.go → terminal_check_bsd.go b/terminal/terminal_check_bsd.go → terminal_check_bsd.go
@@ -1,12 +1,12 @@
 // +build darwin dragonfly freebsd netbsd openbsd
 
-package terminal
+package logrus
 
 import "golang.org/x/sys/unix"
 
 const ioctlReadTermios = unix.TIOCGETA
 
-func IsTerminal(fd int) bool {
+func isTerminal(fd int) bool {
 	_, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
 	return err == nil
 }

diff --git a/terminal_check_notappengine.go b/terminal_check_notappengine.go
@@ -5,14 +5,12 @@ package logrus
 import (
 	"io"
 	"os"
-
-	"github.com/sirupsen/logrus/terminal"
 )
 
 func checkIfTerminal(w io.Writer) bool {
 	switch v := w.(type) {
 	case *os.File:
-		return terminal.IsTerminal(int(v.Fd()))
+		return isTerminal(int(v.Fd()))
 	default:
 		return false
 	}

diff --git a/terminal/terminal_check_unix.go → terminal_check_unix.go b/terminal/terminal_check_unix.go → terminal_check_unix.go
@@ -1,12 +1,12 @@
 // +build linux aix
 
-package terminal
+package logrus
 
 import "golang.org/x/sys/unix"
 
 const ioctlReadTermios = unix.TCGETS
 
-func IsTerminal(fd int) bool {
+func isTerminal(fd int) bool {
 	_, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
 	return err == nil
 }