Skip to content

Commit

Permalink
Merge pull request #1277 from runner-mei/patch-1
Browse files Browse the repository at this point in the history
fix color is disabled on the windows
  • Loading branch information
notzippy committed Jan 31, 2018
2 parents cf64e7b + 3cfb622 commit 732d01e
Showing 1 changed file with 23 additions and 3 deletions.
26 changes: 23 additions & 3 deletions logger/handlers.go
@@ -1,9 +1,12 @@
package logger

import (
"io"
"os"

colorable "github.com/mattn/go-colorable"
"github.com/revel/log15"
"gopkg.in/natefinch/lumberjack.v2"
"io"
)

// Filters out records which do not match the level
Expand Down Expand Up @@ -285,12 +288,29 @@ func (h *CompositeMultiHandler) SetJsonFile(filePath string, options *LogOptions
}
h.SetJson(writer, options)
}

func (h *CompositeMultiHandler) SetTerminal(writer io.Writer, options *LogOptions) {
handler := CallerFileHandler(StreamHandler(
streamHandler := StreamHandler(
writer,
TerminalFormatHandler(
options.GetBoolDefault("noColor", false),
options.GetBoolDefault("smallDate", true))))
options.GetBoolDefault("smallDate", true)))

if os.Stdout == writer {
streamHandler = StreamHandler(
colorable.NewColorableStdout(),
TerminalFormatHandler(
options.GetBoolDefault("noColor", false),
options.GetBoolDefault("smallDate", true)))
} else if os.Stderr == writer {
streamHandler = StreamHandler(
colorable.NewColorableStderr(),
TerminalFormatHandler(
options.GetBoolDefault("noColor", false),
options.GetBoolDefault("smallDate", true)))
}

handler := CallerFileHandler(streamHandler)
if options.HandlerWrap != nil {
handler = options.HandlerWrap.SetChild(handler)
}
Expand Down

0 comments on commit 732d01e

Please sign in to comment.