Merge pull request #754 from gin-gonic/patch-13

Support google appengine for IsTerminal func.
This commit is contained in:
Bo-Yi Wu 2016-12-04 18:44:33 +08:00 committed by GitHub
commit 18392f589f
2 changed files with 6 additions and 9 deletions

View File

@ -2,9 +2,9 @@ language: go
sudo: false
go:
- 1.4
- 1.5
- 1.6
- 1.7
- 1.5.4
- 1.6.4
- 1.7.4
- tip
script:

View File

@ -8,10 +8,9 @@ import (
"fmt"
"io"
"os"
"runtime"
"time"
"golang.org/x/crypto/ssh/terminal"
"github.com/mattn/go-isatty"
)
var (
@ -50,10 +49,8 @@ func Logger() HandlerFunc {
func LoggerWithWriter(out io.Writer, notlogged ...string) HandlerFunc {
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{}