Skip to content

Commit 60d83ab

Browse files
authored
Merge pull request #172 from cschleiden/cschleiden/humanize-logs
Humanize log output
2 parents 11fb73b + f2b625e commit 60d83ab

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ require (
6767
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
6868
github.com/esimonov/ifshort v1.0.4 // indirect
6969
github.com/ettle/strcase v0.1.1 // indirect
70-
github.com/fatih/color v1.13.0 // indirect
70+
github.com/fatih/color v1.14.1 // indirect
7171
github.com/fatih/structtag v1.2.0 // indirect
7272
github.com/fsnotify/fsnotify v1.5.4 // indirect
7373
github.com/fzipp/gocyclo v0.6.0 // indirect
@@ -123,7 +123,7 @@ require (
123123
github.com/maratori/testpackage v1.1.0 // indirect
124124
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
125125
github.com/mattn/go-colorable v0.1.13 // indirect
126-
github.com/mattn/go-isatty v0.0.16 // indirect
126+
github.com/mattn/go-isatty v0.0.17 // indirect
127127
github.com/mattn/go-runewidth v0.0.9 // indirect
128128
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
129129
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
@@ -181,7 +181,7 @@ require (
181181
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
182182
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
183183
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
184-
golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41 // indirect
184+
golang.org/x/sys v0.3.0 // indirect
185185
golang.org/x/text v0.3.7 // indirect
186186
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
187187
google.golang.org/grpc v1.46.2 // indirect

go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ github.com/ettle/strcase v0.1.1 h1:htFueZyVeE1XNnMEfbqp5r67qAN/4r6ya1ysq8Q+Zcw=
142142
github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY=
143143
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
144144
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
145+
github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
146+
github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
145147
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
146148
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
147149
github.com/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y=
@@ -395,6 +397,8 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky
395397
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
396398
github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
397399
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
400+
github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
401+
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
398402
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
399403
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
400404
github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
@@ -794,6 +798,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
794798
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
795799
golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41 h1:ohgcoMbSofXygzo6AD2I1kz3BFmW1QArPYTtwEM3UXc=
796800
golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
801+
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
802+
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
797803
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
798804
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
799805
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

internal/logger/logger.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"log"
66

77
lg "github.com/cschleiden/go-workflows/log"
8+
"github.com/fatih/color"
89
)
910

1011
type defaultLogger struct {
@@ -42,15 +43,19 @@ func (dl *defaultLogger) With(fields ...interface{}) lg.Logger {
4243
func (dl *defaultLogger) formatFields(level, msg string, fields ...interface{}) []any {
4344
var result []any
4445

45-
result = append(result, level)
46-
result = append(result, msg)
46+
result = append(result, color.GreenString("|%s|", level))
47+
result = append(result, color.New(color.Bold, color.FgWhite).Sprintf("%-30s", msg))
4748

4849
for i := 0; i < len(dl.defaultFields)/2; i++ {
49-
result = append(result, fmt.Sprintf("%v=%v", dl.defaultFields[i*2], dl.defaultFields[i*2+1]))
50+
name := color.New(color.FgHiBlue).Sprintf("%v", dl.defaultFields[i*2])
51+
value := color.New(color.Faint).Sprintf("%v", dl.defaultFields[i*2+1])
52+
result = append(result, fmt.Sprintf("%v=%v", name, value))
5053
}
5154

5255
for i := 0; i < len(fields)/2; i++ {
53-
result = append(result, fmt.Sprintf("%v=%v", fields[i*2], fields[i*2+1]))
56+
name := color.New(color.FgHiBlue).Sprintf("%v", fields[i*2])
57+
value := color.New(color.Faint).Sprintf("%v", fields[i*2+1])
58+
result = append(result, fmt.Sprintf("%v=%v", name, value))
5459
}
5560

5661
return result

0 commit comments

Comments
 (0)