ソースを参照

Support google appengine for IsTerminal func.

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
Bo-Yi Wu 9 年 前
コミット
38e4b1d2fe
1 ファイル変更3 行追加6 行削除
  1. 3 6
      logger.go

+ 3 - 6
logger.go

@@ -8,10 +8,9 @@ import (
 	"fmt"
 	"fmt"
 	"io"
 	"io"
 	"os"
 	"os"
-	"runtime"
 	"time"
 	"time"
 
 
-	"golang.org/x/crypto/ssh/terminal"
+	"github.com/mattn/go-isatty"
 )
 )
 
 
 var (
 var (
@@ -50,10 +49,8 @@ func Logger() HandlerFunc {
 func LoggerWithWriter(out io.Writer, notlogged ...string) HandlerFunc {
 func LoggerWithWriter(out io.Writer, notlogged ...string) HandlerFunc {
 	isTerm := true
 	isTerm := true
 
 
-	if runtime.GOOS != "appengine" && runtime.GOOS != "netbsd" && runtime.GOOS != "openbsd" {
-		if outFile, ok := out.(*os.File); ok {
-			isTerm = terminal.IsTerminal(int(outFile.Fd()))
-		}
+	if w, ok := out.(*os.File); !ok || !isatty.IsTerminal(w.Fd()) {
+		isTerm = false
 	}
 	}
 
 
 	var skip map[string]struct{}
 	var skip map[string]struct{}