Skip to content

Commit

Permalink
Merge pull request #53 from caarlos0/cli-color
Browse files Browse the repository at this point in the history
cli: using fatih/color to better support windows
  • Loading branch information
tj authored Jan 17, 2018
2 parents bf81de4 + a4c544f commit 17c1d76
Showing 1 changed file with 10 additions and 18 deletions.
28 changes: 10 additions & 18 deletions handlers/cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"time"

"github.com/apex/log"
"github.com/fatih/color"
)

// Default handler outputting to stderr.
Expand All @@ -17,23 +18,15 @@ var Default = New(os.Stderr)
// start time.
var start = time.Now()

// colors.
const (
none = 0
red = 31
green = 32
yellow = 33
blue = 34
gray = 37
)
var bold = color.New(color.Bold)

// Colors mapping.
var Colors = [...]int{
log.DebugLevel: gray,
log.InfoLevel: blue,
log.WarnLevel: yellow,
log.ErrorLevel: red,
log.FatalLevel: red,
var Colors = [...]*color.Color{
log.DebugLevel: color.New(color.FgWhite),
log.InfoLevel: color.New(color.FgBlue),
log.WarnLevel: color.New(color.FgYellow),
log.ErrorLevel: color.New(color.FgRed),
log.FatalLevel: color.New(color.FgRed),
}

// Strings mapping.
Expand Down Expand Up @@ -69,14 +62,13 @@ func (h *Handler) HandleLog(e *log.Entry) error {
h.mu.Lock()
defer h.mu.Unlock()

fmt.Fprintf(h.Writer, "\033[%dm%*s\033[0m %-25s", color, h.Padding+1, level, e.Message)
color.Fprintf(h.Writer, "%s %-25s", bold.Sprintf("%*s", h.Padding+1, level), e.Message)

for _, name := range names {
if name == "source" {
continue
}

fmt.Fprintf(h.Writer, " \033[%dm%s\033[0m=%v", color, name, e.Fields.Get(name))
fmt.Fprintf(h.Writer, " %s=%s", color.Sprint(name), e.Fields.Get(name))
}

fmt.Fprintln(h.Writer)
Expand Down

0 comments on commit 17c1d76

Please sign in to comment.