Browse Source

Revert "Merge pull request #744 from aviddiviner/logger-fix"

This reverts commit c3bfd69303d0fdaf2d43a7ff07cc8ee45ec7bb3f, reversing
changes made to 9177f01c2843b91820780197f521ba48554b9df3.
Javier Provecho Fernandez 9 years ago
parent
commit
e32758c248
1 changed files with 2 additions and 13 deletions
  1. 2 13
      logger.go

+ 2 - 13
logger.go

@@ -7,10 +7,7 @@ package gin
 import (
 import (
 	"fmt"
 	"fmt"
 	"io"
 	"io"
-	"os"
 	"time"
 	"time"
-
-	"golang.org/x/crypto/ssh/terminal"
 )
 )
 
 
 var (
 var (
@@ -47,11 +44,6 @@ func Logger() HandlerFunc {
 // LoggerWithWriter instance a Logger middleware with the specified writter buffer.
 // LoggerWithWriter instance a Logger middleware with the specified writter buffer.
 // Example: os.Stdout, a file opened in write mode, a socket...
 // Example: os.Stdout, a file opened in write mode, a socket...
 func LoggerWithWriter(out io.Writer, notlogged ...string) HandlerFunc {
 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{}
 	var skip map[string]struct{}
 
 
 	if length := len(notlogged); length > 0 {
 	if length := len(notlogged); length > 0 {
@@ -79,11 +71,8 @@ func LoggerWithWriter(out io.Writer, notlogged ...string) HandlerFunc {
 			clientIP := c.ClientIP()
 			clientIP := c.ClientIP()
 			method := c.Request.Method
 			method := c.Request.Method
 			statusCode := c.Writer.Status()
 			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()
 			comment := c.Errors.ByType(ErrorTypePrivate).String()
 
 
 			fmt.Fprintf(out, "[GIN] %v |%s %3d %s| %13v | %s |%s  %s %-7s %s\n%s",
 			fmt.Fprintf(out, "[GIN] %v |%s %3d %s| %13v | %s |%s  %s %-7s %s\n%s",