From 041ca04a4768ededad44dcc2748f3d47e4b59bde Mon Sep 17 00:00:00 2001 From: Javier Provecho Fernandez Date: Sat, 3 Dec 2016 22:10:08 +0100 Subject: [PATCH] Revert "Merge pull request #744 from aviddiviner/logger-fix" This reverts commit c3bfd69303d0fdaf2d43a7ff07cc8ee45ec7bb3f, reversing changes made to 9177f01c2843b91820780197f521ba48554b9df3. --- logger.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/logger.go b/logger.go index b4743a7f..d56bc628 100644 --- a/logger.go +++ b/logger.go @@ -7,10 +7,7 @@ package gin import ( "fmt" "io" - "os" "time" - - "golang.org/x/crypto/ssh/terminal" ) var ( @@ -47,11 +44,6 @@ func Logger() HandlerFunc { // LoggerWithWriter instance a Logger middleware with the specified writter buffer. // Example: os.Stdout, a file opened in write mode, a socket... func LoggerWithWriter(out io.Writer, notlogged ...string) HandlerFunc { - isTerm := true - if outFile, ok := out.(*os.File); ok { - isTerm = terminal.IsTerminal(int(outFile.Fd())) - } - var skip map[string]struct{} if length := len(notlogged); length > 0 { @@ -79,11 +71,8 @@ func LoggerWithWriter(out io.Writer, notlogged ...string) HandlerFunc { clientIP := c.ClientIP() method := c.Request.Method statusCode := c.Writer.Status() - var statusColor, methodColor string - if isTerm { - statusColor = colorForStatus(statusCode) - methodColor = colorForMethod(method) - } + statusColor := colorForStatus(statusCode) + methodColor := colorForMethod(method) comment := c.Errors.ByType(ErrorTypePrivate).String() fmt.Fprintf(out, "[GIN] %v |%s %3d %s| %13v | %s |%s %s %-7s %s\n%s",