Merge pull request #16 from fortio/simpler_color

Simplified color by relying on log.Colors to be cleared when color mode is off

Author: ldemailly

Makefile

@@ -8,5 +8,7 @@ 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 Color:                       ==========="
+	go run ./levelsDemo 2>&1 | go run -race . -no-color
 
 .PHONY: tests manual-check

go.mod

@@ -3,16 +3,16 @@ module fortio.org/logc
 go 1.18
 
 require (
-	fortio.org/cli v1.2.0
-	fortio.org/log v1.8.1
-	fortio.org/scli v1.9.0
+	fortio.org/cli v1.3.0
+	fortio.org/log v1.9.1
+	fortio.org/scli v1.10.0
 )
 
 require (
 	fortio.org/dflag v1.5.2 // indirect
 	fortio.org/sets v1.0.3 // indirect
 	fortio.org/version v1.0.2 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
+	golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b // indirect
 	golang.org/x/sys v0.10.0 // indirect
 )

go.sum

@@ -1,20 +1,20 @@
 fortio.org/assert v1.1.4 h1:Za1RaG+OjsTMpQS3J3UCvTF6wc4+IOHCz+jAOU37Y4o=
-fortio.org/cli v1.2.0 h1:MXmbYnbNHcclf0xYLZjeCnTINby7FpooJxR01+hnBmM=
-fortio.org/cli v1.2.0/go.mod h1:zJwHjRnvVqneF7ES+REfElc33xMjhbRDJslSrqIK9Kk=
+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.8.1 h1:Ybtjp+qDXb124ESnZ0XVuXJ6khDrWcom/C55YPupoKg=
-fortio.org/log v1.8.1/go.mod h1:u/8/2lyczXq52aT5Nw6reD+3cR6m/EbS2jBiIYhgiTU=
-fortio.org/scli v1.9.0 h1:laTn/mACr1+TRKH3ZKaQWw58kTzQ1ntpg2sH02KUJAA=
-fortio.org/scli v1.9.0/go.mod h1:Ox3nhp3eJpF2rQsZ8fBKXqdJGQPTQHWEZpLikDnkzjY=
+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/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=
 fortio.org/sets v1.0.3/go.mod h1:QZVj0r6KP/ZD9ebySW9SgxVNy/NjghUfyHW9NN+WU+4=
 fortio.org/version v1.0.2 h1:8NwxdX58aoeKx7T5xAPO0xlUu1Hpk42nRz5s6e6eKZ0=
 fortio.org/version v1.0.2/go.mod h1:2JQp9Ax+tm6QKiGuzR5nJY63kFeANcgrZ0osoQFDVm0=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw=
-golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
+golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b h1:r+vk0EmXNmekl0S0BascoeeoHk/L7wmaW2QF90K+kYI=
+golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

logc.go

@@ -55,21 +55,25 @@ func GetAttributes(line string) string {
 }
 
 func main() {
-	noColorFlag := flag.Bool("no-color", false, "Do not colorize output")
+	noColorFlag := flag.Bool("no-color", false, "Do not colorize output (same as -logger-no-color)")
 	cli.ArgsHelp = " < log.json\nor for instance\n\tfortio server 2>&1 | logc\n" +
 		"to convert JSON fortio logger lines from stdin to (ansi) colorized text"
 	cli.Main()
 	// read stdin line by line
 	scanner := bufio.NewScanner(os.Stdin)
 	prevDate := time.UnixMilli(0)
-	noColor := *noColorFlag
+	if *noColorFlag {
+		log.Debugf("Disabling color - was %v", log.Color)
+		log.Config.ConsoleColor = false
+		log.SetColorMode()
+	}
 	for scanner.Scan() {
 		line := scanner.Bytes()
-		ProcessLogLine(os.Stdout, &prevDate, noColor, line)
+		ProcessLogLine(os.Stdout, &prevDate, line)
 	}
 }
 
-func ProcessLogLine(w io.Writer, prevDate *time.Time, noColor bool, line []byte) {
+func ProcessLogLine(w io.Writer, prevDate *time.Time, line []byte) {
 	// json deserialize
 	e := log.JSONEntry{}
 	err := json.Unmarshal(line, &e)
@@ -79,17 +83,8 @@ func ProcessLogLine(w io.Writer, prevDate *time.Time, noColor bool, line []byte)
 		return
 	}
 	tsStr := ""
-	reset := log.Colors.Reset
-	darkGrey := log.Colors.DarkGray
-	grey := log.Colors.Gray
 	// uppercase single letter level + color extraction
 	lvl, color := LevelToColor(e.Level)
-	if noColor {
-		color = ""
-		reset = ""
-		darkGrey = ""
-		grey = ""
-	}
 	if e.TS != 0 {
 		ts := e.Time()
 		// Each time the day changes we print a header
@@ -98,15 +93,15 @@ func ProcessLogLine(w io.Writer, prevDate *time.Time, noColor bool, line []byte)
 			*prevDate = ts
 		}
 		// Use full microseconds resolution unlike the log built in color version which stops at millis.
-		tsStr = ts.Format(darkGrey + "15:04:05.000000 ")
+		tsStr = ts.Format(log.Colors.DarkGray + "15:04:05.000000 ")
 	}
 	if e.R > 0 {
-		tsStr += fmt.Sprintf(grey+"[%d] ", e.R)
+		tsStr += fmt.Sprintf(log.Colors.Gray+"[%d] ", e.R)
 	}
 	fileLine := ""
 	if e.Line != 0 {
 		fileLine = fmt.Sprintf("%s:%d> ", e.File, e.Line)
 	}
 	// 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)), reset)
+	fmt.Fprintf(w, "%s%s%s %s%s%s%s\n", tsStr, color, lvl, fileLine, e.Msg, GetAttributes(string(line)), log.Colors.Reset)
 }

logc_test.go

@@ -29,6 +29,8 @@ func TestGetAttributes(t *testing.T) {
 
 func TestLevels(t *testing.T) {
 	var zeroTime time.Time
+	log.Config.ForceColor = true
+	log.SetColorMode()
 	for _, tc := range []struct {
 		in   string
 		want string
@@ -38,7 +40,7 @@ func TestLevels(t *testing.T) {
 	} {
 		buf := &strings.Builder{}
 		w := bufio.NewWriter(buf)
-		ProcessLogLine(w, &zeroTime, false, []byte(tc.in))
+		ProcessLogLine(w, &zeroTime, []byte(tc.in))
 		w.Flush()
 		got := buf.String()
 		if got != tc.want {