From 3a7bcb231fe6339e2671b70096b5c1ee0dac3387 Mon Sep 17 00:00:00 2001 From: Laurent Demailly Date: Wed, 2 Aug 2023 11:19:25 -0700 Subject: [PATCH 1/2] update to match log --- Makefile | 2 ++ go.mod | 2 +- go.sum | 4 ++-- logc.go | 7 +++++-- logc_test.go | 3 ++- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ea6f451..ab231df 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,8 @@ manual-check: go run ./levelsDemo 2>&1 | TZ=UTC go run -race . @echo "=========== Without Timestamp nor go Routine ID: ===========" go run ./levelsDemo -logger-timestamp=false -logger-goroutine=false 2>&1 | go run -race . + @echo "=========== Without file/line ===========" + go run ./levelsDemo -logger-file-line=false -logger-timestamp=false -logger-goroutine=false 2>&1 | go run -race . @echo "=========== Without Color: ===========" go run ./levelsDemo 2>&1 | go run -race . -no-color diff --git a/go.mod b/go.mod index eba1421..a25dfe4 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( fortio.org/cli v1.3.0 - fortio.org/log v1.9.1 + fortio.org/log v1.9.2-pre6 fortio.org/scli v1.10.0 ) diff --git a/go.sum b/go.sum index 1b6228c..75dc191 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,8 @@ fortio.org/cli v1.3.0 h1:OsM2P/OIjHFa47mUN914v32ZmgQKJdVrvyiKIYQSaVw= fortio.org/cli v1.3.0/go.mod h1:eg30mF10yx+T9z6fr1ES87KCfmGaebnhnhbqc8t3IBo= fortio.org/dflag v1.5.2 h1:F9XVRj4Qr2IbJP7BMj7XZc9wB0Q/RZ61Ool+4YPVad8= fortio.org/dflag v1.5.2/go.mod h1:ppb/A8u+KKg+qUUYZNYuvRnXuVb8IsdHb/XGzsmjkN8= -fortio.org/log v1.9.1 h1:yNxHqTL6g9VdT38g/BehUZkNOuczxnl2YsdTyENn5YM= -fortio.org/log v1.9.1/go.mod h1:u/8/2lyczXq52aT5Nw6reD+3cR6m/EbS2jBiIYhgiTU= +fortio.org/log v1.9.2-pre6 h1:Y4srizXYBTcZJSF7OfiYnOf6rmzvMdy9N5nvk04gq48= +fortio.org/log v1.9.2-pre6/go.mod h1:u/8/2lyczXq52aT5Nw6reD+3cR6m/EbS2jBiIYhgiTU= fortio.org/scli v1.10.0 h1:0OGr8g7mcfQ0UXgTODwiw4XoWdOgkbzU+8GIH9Qo4P8= fortio.org/scli v1.10.0/go.mod h1:T7M7THNaLG58ryqCc7E87dwBPXfraz3k+7HngNlVwWA= fortio.org/sets v1.0.3 h1:HzewdGjH69YmyW06yzplL35lGr+X4OcqQt0qS6jbaO4= diff --git a/logc.go b/logc.go index 0ac93fb..8d7c7f8 100644 --- a/logc.go +++ b/logc.go @@ -21,7 +21,8 @@ func LevelToColor(levelStr string) (string, string) { log.Critf("Bug/Unknown level %q", levelStr) return "?", log.Colors.Blue } - return log.LevelToStrA[level][0:1], log.LevelToColor[level] + log.Debugf("level %q -> %d", levelStr, level) + return log.ColorLevelToStr(level), log.LevelToColor[level] } // GetAttributes returns the remaining/additional attributes after the `msg`, if any, for text output. @@ -101,7 +102,9 @@ func ProcessLogLine(w io.Writer, prevDate *time.Time, line []byte) { fileLine := "" if e.Line != 0 { fileLine = fmt.Sprintf("%s:%d> ", e.File, e.Line) + } else { + lvl += ">" } // Msg can be multi line. - fmt.Fprintf(w, "%s%s%s %s%s%s%s\n", tsStr, color, lvl, fileLine, e.Msg, GetAttributes(string(line)), log.Colors.Reset) + fmt.Fprintf(w, "%s%s %s%s%s%s%s\n", tsStr, lvl, fileLine, color, e.Msg, GetAttributes(string(line)), log.Colors.Reset) } diff --git a/logc_test.go b/logc_test.go index 2a2845e..2390121 100644 --- a/logc_test.go +++ b/logc_test.go @@ -35,7 +35,8 @@ func TestLevels(t *testing.T) { in string want string }{ - {`{"level":"trace","msg":"foo"}`, log.Colors.Cyan + "V foo" + log.Colors.Reset + "\n"}, + {`{"level":"trace","msg":"foo"}`, log.Colors.Cyan + "Verb" + log.Colors.DarkGray + ">" + + log.Colors.Cyan + "foo" + log.Colors.Reset + "\n"}, {`{"level":"xyz","msg":"foo"}`, log.Colors.Blue + "? foo" + log.Colors.Reset + "\n"}, } { buf := &strings.Builder{} From d561c18a781c0e1023b6110f8d8bf0b7f28df294 Mon Sep 17 00:00:00 2001 From: Laurent Demailly Date: Wed, 2 Aug 2023 13:54:46 -0700 Subject: [PATCH 2/2] Update to released versions and test fix plus unknown level change of color --- go.mod | 6 +++--- go.sum | 12 ++++++------ logc.go | 2 +- logc_test.go | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index a25dfe4..9bfc2ed 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module fortio.org/logc go 1.18 require ( - fortio.org/cli v1.3.0 - fortio.org/log v1.9.2-pre6 - fortio.org/scli v1.10.0 + fortio.org/cli v1.3.1 + fortio.org/log v1.9.2 + fortio.org/scli v1.10.1 ) require ( diff --git a/go.sum b/go.sum index 75dc191..a2c2d1e 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,12 @@ fortio.org/assert v1.1.4 h1:Za1RaG+OjsTMpQS3J3UCvTF6wc4+IOHCz+jAOU37Y4o= -fortio.org/cli v1.3.0 h1:OsM2P/OIjHFa47mUN914v32ZmgQKJdVrvyiKIYQSaVw= -fortio.org/cli v1.3.0/go.mod h1:eg30mF10yx+T9z6fr1ES87KCfmGaebnhnhbqc8t3IBo= +fortio.org/cli v1.3.1 h1:ExJyciUTLLY1gznExrthduDyw0jKKP95UKrMGfh+n+8= +fortio.org/cli v1.3.1/go.mod h1:R4+pCDYD+40fvomN0yg+CZmU6gkA1PrsunR2hy0dfts= fortio.org/dflag v1.5.2 h1:F9XVRj4Qr2IbJP7BMj7XZc9wB0Q/RZ61Ool+4YPVad8= fortio.org/dflag v1.5.2/go.mod h1:ppb/A8u+KKg+qUUYZNYuvRnXuVb8IsdHb/XGzsmjkN8= -fortio.org/log v1.9.2-pre6 h1:Y4srizXYBTcZJSF7OfiYnOf6rmzvMdy9N5nvk04gq48= -fortio.org/log v1.9.2-pre6/go.mod h1:u/8/2lyczXq52aT5Nw6reD+3cR6m/EbS2jBiIYhgiTU= -fortio.org/scli v1.10.0 h1:0OGr8g7mcfQ0UXgTODwiw4XoWdOgkbzU+8GIH9Qo4P8= -fortio.org/scli v1.10.0/go.mod h1:T7M7THNaLG58ryqCc7E87dwBPXfraz3k+7HngNlVwWA= +fortio.org/log v1.9.2 h1:rVCzSFhTD+lsdGUhVuTWoqdFjJP+XD3da9p09pwPohY= +fortio.org/log v1.9.2/go.mod h1:u/8/2lyczXq52aT5Nw6reD+3cR6m/EbS2jBiIYhgiTU= +fortio.org/scli v1.10.1 h1:jJVvPcK9RO2OOKc2CzxwLavJsvXxr1DwCU6VH3efCy8= +fortio.org/scli v1.10.1/go.mod h1:A7ASXPbm6DDhtuPZV6pAiNfAwcUchABy41ndZk8AID0= fortio.org/sets v1.0.3 h1:HzewdGjH69YmyW06yzplL35lGr+X4OcqQt0qS6jbaO4= fortio.org/sets v1.0.3/go.mod h1:QZVj0r6KP/ZD9ebySW9SgxVNy/NjghUfyHW9NN+WU+4= fortio.org/version v1.0.2 h1:8NwxdX58aoeKx7T5xAPO0xlUu1Hpk42nRz5s6e6eKZ0= diff --git a/logc.go b/logc.go index 8d7c7f8..e57e5ce 100644 --- a/logc.go +++ b/logc.go @@ -19,7 +19,7 @@ func LevelToColor(levelStr string) (string, string) { level, found := log.JSONStringLevelToLevel[levelStr] if !found { log.Critf("Bug/Unknown level %q", levelStr) - return "?", log.Colors.Blue + return log.Colors.BrightRed + "?", log.Colors.Blue } log.Debugf("level %q -> %d", levelStr, level) return log.ColorLevelToStr(level), log.LevelToColor[level] diff --git a/logc_test.go b/logc_test.go index 2390121..0c0d987 100644 --- a/logc_test.go +++ b/logc_test.go @@ -35,9 +35,9 @@ func TestLevels(t *testing.T) { in string want string }{ - {`{"level":"trace","msg":"foo"}`, log.Colors.Cyan + "Verb" + log.Colors.DarkGray + ">" + + {`{"level":"trace","msg":"foo"}`, log.Colors.Cyan + "Verb" + log.Colors.DarkGray + "> " + log.Colors.Cyan + "foo" + log.Colors.Reset + "\n"}, - {`{"level":"xyz","msg":"foo"}`, log.Colors.Blue + "? foo" + log.Colors.Reset + "\n"}, + {`{"level":"xyz","msg":"foo"}`, log.Colors.BrightRed + "?> " + log.Colors.Blue + "foo" + log.Colors.Reset + "\n"}, } { buf := &strings.Builder{} w := bufio.NewWriter(buf)