diff --git a/terminal_check_bsd.go b/internal/terminal/terminal_check_bsd.go similarity index 50% rename from terminal_check_bsd.go rename to internal/terminal/terminal_check_bsd.go index 8f9c33094..a3ffe6d97 100644 --- a/terminal_check_bsd.go +++ b/internal/terminal/terminal_check_bsd.go @@ -1,7 +1,12 @@ // +build darwin dragonfly freebsd netbsd openbsd -package logrus +package terminal import "golang.org/x/sys/unix" const ioctlReadTermios = unix.TIOCGETA + +func IsTerminal(fd int) bool { + _, err := unix.IoctlGetTermios(fd, ioctlReadTermios) + return err == nil +} \ No newline at end of file diff --git a/internal/terminal/terminal_check_unix.go b/internal/terminal/terminal_check_unix.go new file mode 100644 index 000000000..f76a08912 --- /dev/null +++ b/internal/terminal/terminal_check_unix.go @@ -0,0 +1,12 @@ +// +build linux aix + +package terminal + +import "golang.org/x/sys/unix" + +const ioctlReadTermios = unix.TCGETS + +func IsTerminal(fd int) bool { + _, err := unix.IoctlGetTermios(fd, ioctlReadTermios) + return err == nil +} \ No newline at end of file diff --git a/terminal_check_aix.go b/terminal_check_aix.go deleted file mode 100644 index 948c38512..000000000 --- a/terminal_check_aix.go +++ /dev/null @@ -1,9 +0,0 @@ -// +build aix - -package logrus - -import ( - "golang.org/x/sys/unix" -) - -const ioctlReadTermios = unix.TCGETS diff --git a/terminal_check_linux.go b/terminal_check_linux.go deleted file mode 100644 index 169019785..000000000 --- a/terminal_check_linux.go +++ /dev/null @@ -1,7 +0,0 @@ -// +build linux - -package logrus - -import "golang.org/x/sys/unix" - -const ioctlReadTermios = unix.TCGETS diff --git a/terminal_check_notappengine.go b/terminal_check_notappengine.go index 156a93b7d..6f28f89f5 100644 --- a/terminal_check_notappengine.go +++ b/terminal_check_notappengine.go @@ -6,15 +6,13 @@ import ( "io" "os" - "golang.org/x/sys/unix" + "github.com/sirupsen/logrus/internal/terminal" ) func checkIfTerminal(w io.Writer) bool { switch v := w.(type) { case *os.File: - _, err := unix.IoctlGetTermios(int(v.Fd()), ioctlReadTermios) - - return err == nil + return terminal.IsTerminal(int(v.Fd())) default: return false }