Skip to content

Commit a2ed974

Browse files
Dean KarnDean Karn
Dean Karn
authored and
Dean Karn
committed
update log to use new ansi library to reduce duplicate code in multiple projects.
1 parent 3995d42 commit a2ed974

File tree

5 files changed

+60
-87
lines changed

5 files changed

+60
-87
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## log
22
<img align="right" src="https://raw.githubusercontent.com/go-playground/log/master/logo.png">
3-
![Project status](https://img.shields.io/badge/version-4.0.1-green.svg)
3+
![Project status](https://img.shields.io/badge/version-4.1.0-green.svg)
44
[![Build Status](https://semaphoreci.com/api/v1/joeybloggs/log/branches/master/badge.svg)](https://semaphoreci.com/joeybloggs/log)
55
[![Coverage Status](https://coveralls.io/repos/github/go-playground/log/badge.svg?branch=master)](https://coveralls.io/github/go-playground/log?branch=master)
66
[![Go Report Card](https://goreportcard.com/badge/github.com/go-playground/log)](https://goreportcard.com/report/github.com/go-playground/log)

‎colors.go‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎handlers/console/console.go‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"strconv"
1010
"strings"
1111

12+
"github.com/go-playground/ansi"
1213
"github.com/go-playground/log"
1314
)
1415

@@ -34,7 +35,7 @@ const (
3435
type Console struct {
3536
buffer uint
3637
numWorkers uint
37-
colors [9]log.ANSIEscSeq
38+
colors [9]ansi.EscSeq
3839
writer io.Writer
3940
formatFunc FormatFunc
4041
timestampFormat string
@@ -45,16 +46,16 @@ type Console struct {
4546
}
4647

4748
// Colors mapping.
48-
var defaultColors = [...]log.ANSIEscSeq{
49-
log.DebugLevel: log.Green,
50-
log.TraceLevel: log.White,
51-
log.InfoLevel: log.Blue,
52-
log.NoticeLevel: log.LightCyan,
53-
log.WarnLevel: log.Yellow,
54-
log.ErrorLevel: log.LightRed,
55-
log.PanicLevel: log.Red,
56-
log.AlertLevel: log.Red + log.Underscore,
57-
log.FatalLevel: log.Red + log.Underscore + log.Blink,
49+
var defaultColors = [...]ansi.EscSeq{
50+
log.DebugLevel: ansi.Green,
51+
log.TraceLevel: ansi.White,
52+
log.InfoLevel: ansi.Blue,
53+
log.NoticeLevel: ansi.LightCyan,
54+
log.WarnLevel: ansi.Yellow,
55+
log.ErrorLevel: ansi.LightRed,
56+
log.PanicLevel: ansi.Red,
57+
log.AlertLevel: ansi.Red + ansi.Underline,
58+
log.FatalLevel: ansi.Red + ansi.Underline + ansi.Blink,
5859
}
5960

6061
// New returns a new instance of the console logger
@@ -99,7 +100,7 @@ func (c *Console) DisplayColor() bool {
99100
}
100101

101102
// GetDisplayColor returns the color for the given log level
102-
func (c *Console) GetDisplayColor(level log.Level) log.ANSIEscSeq {
103+
func (c *Console) GetDisplayColor(level log.Level) ansi.EscSeq {
103104
return c.colors[level]
104105
}
105106

@@ -229,7 +230,7 @@ func defaultFormatFunc(c *Console) Formatter {
229230

230231
if c.DisplayColor() {
231232

232-
var color log.ANSIEscSeq
233+
var color ansi.EscSeq
233234

234235
return func(e *log.Entry) []byte {
235236
b = b[0:0]
@@ -247,7 +248,7 @@ func defaultFormatFunc(c *Console) Formatter {
247248
b = append(b, space)
248249
}
249250
b = append(b, lvl...)
250-
b = append(b, log.Reset...)
251+
b = append(b, ansi.Reset...)
251252
b = append(b, space)
252253
b = append(b, e.Message...)
253254

@@ -277,7 +278,7 @@ func defaultFormatFunc(c *Console) Formatter {
277278
}
278279

279280
b = append(b, lvl...)
280-
b = append(b, log.Reset...)
281+
b = append(b, ansi.Reset...)
281282
b = append(b, space)
282283
b = append(b, file...)
283284
b = append(b, colon)
@@ -290,7 +291,7 @@ func defaultFormatFunc(c *Console) Formatter {
290291
b = append(b, space)
291292
b = append(b, color...)
292293
b = append(b, f.Key...)
293-
b = append(b, log.Reset...)
294+
b = append(b, ansi.Reset...)
294295
b = append(b, equals)
295296

296297
switch f.Value.(type) {

‎handlers/syslog/syslog.go‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
syslog "github.com/RackSec/srslog"
1212

13+
"github.com/go-playground/ansi"
1314
"github.com/go-playground/log"
1415
)
1516

@@ -34,7 +35,7 @@ const (
3435
type Syslog struct {
3536
buffer uint
3637
numWorkers uint
37-
colors [9]log.ANSIEscSeq
38+
colors [9]ansi.EscSeq
3839
writer *syslog.Writer
3940
formatFunc FormatFunc
4041
timestampFormat string
@@ -45,16 +46,16 @@ type Syslog struct {
4546

4647
var (
4748
// Colors mapping.
48-
defaultColors = [...]log.ANSIEscSeq{
49-
log.DebugLevel: log.Green,
50-
log.TraceLevel: log.White,
51-
log.InfoLevel: log.Blue,
52-
log.NoticeLevel: log.LightCyan,
53-
log.WarnLevel: log.Yellow,
54-
log.ErrorLevel: log.LightRed,
55-
log.PanicLevel: log.Red,
56-
log.AlertLevel: log.Red + log.Underscore,
57-
log.FatalLevel: log.Red + log.Underscore + log.Blink,
49+
defaultColors = [...]ansi.EscSeq{
50+
log.DebugLevel: ansi.Green,
51+
log.TraceLevel: ansi.White,
52+
log.InfoLevel: ansi.Blue,
53+
log.NoticeLevel: ansi.LightCyan,
54+
log.WarnLevel: ansi.Yellow,
55+
log.ErrorLevel: ansi.LightRed,
56+
log.PanicLevel: ansi.Red,
57+
log.AlertLevel: ansi.Red + ansi.Underline,
58+
log.FatalLevel: ansi.Red + ansi.Underline + ansi.Blink,
5859
}
5960
)
6061

@@ -112,7 +113,7 @@ func (s *Syslog) DisplayColor() bool {
112113
}
113114

114115
// GetDisplayColor returns the color for the given log level
115-
func (s *Syslog) GetDisplayColor(level log.Level) log.ANSIEscSeq {
116+
func (s *Syslog) GetDisplayColor(level log.Level) ansi.EscSeq {
116117
return s.colors[level]
117118
}
118119

@@ -222,7 +223,7 @@ func defaultFormatFunc(s *Syslog) Formatter {
222223

223224
if s.DisplayColor() {
224225

225-
var color log.ANSIEscSeq
226+
var color ansi.EscSeq
226227

227228
return func(e *log.Entry) []byte {
228229
b = b[0:0]
@@ -240,7 +241,7 @@ func defaultFormatFunc(s *Syslog) Formatter {
240241
b = append(b, space)
241242
}
242243
b = append(b, lvl...)
243-
b = append(b, log.Reset...)
244+
b = append(b, ansi.Reset...)
244245
b = append(b, space)
245246
b = append(b, e.Message...)
246247

@@ -270,7 +271,7 @@ func defaultFormatFunc(s *Syslog) Formatter {
270271
}
271272

272273
b = append(b, lvl...)
273-
b = append(b, log.Reset...)
274+
b = append(b, ansi.Reset...)
274275
b = append(b, space)
275276
b = append(b, file...)
276277
b = append(b, colon)
@@ -283,7 +284,7 @@ func defaultFormatFunc(s *Syslog) Formatter {
283284
b = append(b, space)
284285
b = append(b, color...)
285286
b = append(b, f.Key...)
286-
b = append(b, log.Reset...)
287+
b = append(b, ansi.Reset...)
287288
b = append(b, equals)
288289

289290
switch f.Value.(type) {

‎log_test.go‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
"sync"
88
"testing"
99
"time"
10+
11+
"github.com/go-playground/ansi"
1012
)
1113

1214
// NOTES:
@@ -23,9 +25,7 @@ import (
2325
func TestConsoleLogger1(t *testing.T) {
2426
stackTraceLimit = 1000
2527
tests := getLogTests1()
26-
2728
buff := new(bytes.Buffer)
28-
2929
th := &testHandler{
3030
writer: buff,
3131
}
@@ -396,29 +396,29 @@ func TestFatal(t *testing.T) {
396396

397397
func TestColors(t *testing.T) {
398398

399-
fmt.Printf("%sBlack%s\n", Black, Reset)
400-
fmt.Printf("%sDarkGray%s\n", DarkGray, Reset)
401-
fmt.Printf("%sBlue%s\n", Blue, Reset)
402-
fmt.Printf("%sLightBlue%s\n", LightBlue, Reset)
403-
fmt.Printf("%sGreen%s\n", Green, Reset)
404-
fmt.Printf("%sLightGreen%s\n", LightGreen, Reset)
405-
fmt.Printf("%sCyan%s\n", Cyan, Reset)
406-
fmt.Printf("%sLightCyan%s\n", LightCyan, Reset)
407-
fmt.Printf("%sRed%s\n", Red, Reset)
408-
fmt.Printf("%sLightRed%s\n", LightRed, Reset)
409-
fmt.Printf("%sMagenta%s\n", Magenta, Reset)
410-
fmt.Printf("%sLightMagenta%s\n", LightMagenta, Reset)
411-
fmt.Printf("%sBrown%s\n", Brown, Reset)
412-
fmt.Printf("%sYellow%s\n", Yellow, Reset)
413-
fmt.Printf("%sLightGray%s\n", LightGray, Reset)
414-
fmt.Printf("%sWhite%s\n", White, Reset)
415-
416-
fmt.Printf("%s%sUnderscoreRed%s\n", Red, Underscore, Reset)
417-
fmt.Printf("%s%sBlinkRed%s\n", Red, Blink, Reset)
418-
fmt.Printf("%s%s%sBlinkUnderscoreRed%s\n", Red, Blink, Underscore, Reset)
419-
420-
fmt.Printf("%s%sRedInverse%s\n", Red, Inverse, Reset)
421-
fmt.Printf("%sGreenInverse%s\n", Green+Inverse, Reset)
399+
fmt.Printf("%sBlack%s\n", ansi.Black, ansi.Reset)
400+
fmt.Printf("%sDarkGray%s\n", ansi.DarkGray, ansi.Reset)
401+
fmt.Printf("%sBlue%s\n", ansi.Blue, ansi.Reset)
402+
fmt.Printf("%sLightBlue%s\n", ansi.LightBlue, ansi.Reset)
403+
fmt.Printf("%sGreen%s\n", ansi.Green, ansi.Reset)
404+
fmt.Printf("%sLightGreen%s\n", ansi.LightGreen, ansi.Reset)
405+
fmt.Printf("%sCyan%s\n", ansi.Cyan, ansi.Reset)
406+
fmt.Printf("%sLightCyan%s\n", ansi.LightCyan, ansi.Reset)
407+
fmt.Printf("%sRed%s\n", ansi.Red, ansi.Reset)
408+
fmt.Printf("%sLightRed%s\n", ansi.LightRed, ansi.Reset)
409+
fmt.Printf("%sMagenta%s\n", ansi.Magenta, ansi.Reset)
410+
fmt.Printf("%sLightMagenta%s\n", ansi.LightMagenta, ansi.Reset)
411+
fmt.Printf("%sBrown%s\n", ansi.Brown, ansi.Reset)
412+
fmt.Printf("%sYellow%s\n", ansi.Yellow, ansi.Reset)
413+
fmt.Printf("%sLightGray%s\n", ansi.LightGray, ansi.Reset)
414+
fmt.Printf("%sWhite%s\n", ansi.White, ansi.Reset)
415+
416+
fmt.Printf("%s%sUnderscoreRed%s\n", ansi.Red, ansi.Underline, ansi.Reset)
417+
fmt.Printf("%s%sBlinkRed%s\n", ansi.Red, ansi.Blink, ansi.Reset)
418+
fmt.Printf("%s%s%sBlinkUnderscoreRed%s\n", ansi.Red, ansi.Blink, ansi.Underline, ansi.Reset)
419+
420+
fmt.Printf("%s%sRedInverse%s\n", ansi.Red, ansi.Inverse, ansi.Reset)
421+
fmt.Printf("%sGreenInverse%s\n", ansi.Green+ansi.Inverse, ansi.Reset)
422422
}
423423

424424
func getLogTests1() []test {

0 commit comments

Comments
 (0)