remove os-specific IsTerminal methods, and use x/crypto/ssh/terminal …

…instead
sirupsen · Jul 27, 2017 · e66f229 · e66f229
1 parent 9aa7601
commit e66f229
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 144 deletions.
diff --git a/terminal_appengine.go b/terminal_appengine.go
diff --git a/terminal_notwindows.go b/terminal_notwindows.go
diff --git a/terminal_solaris.go b/terminal_solaris.go
diff --git a/terminal_windows.go b/terminal_windows.go
diff --git a/text_formatter.go b/text_formatter.go
@@ -3,10 +3,14 @@ package logrus
 import (
 	"bytes"
 	"fmt"
+	"io"
+	"os"
 	"sort"
 	"strings"
 	"sync"
 	"time"
+
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 const (
@@ -61,7 +65,16 @@ type TextFormatter struct {
 
 func (f *TextFormatter) init(entry *Entry) {
 	if entry.Logger != nil {
-		f.isTerminal = IsTerminal(entry.Logger.Out)
+		f.isTerminal = f.checkIfTerminal(entry.Logger.Out)
+	}
+}
+
+func (f *TextFormatter) checkIfTerminal(w io.Writer) bool {
+	switch v := w.(type) {
+	case *os.File:
+		return terminal.IsTerminal(int(v.Fd()))
+	default:
+		return false
 	}
 }