Fix Windows console printing (#8805)

Print to console which does translation and not directly to stdout.

Fixes #8804
master
Klaus Post 5 years ago committed by Harshavardhana
parent 3320878dfb
commit 627fdfeab7
  1. 6
      cmd/logger/console.go
  2. 3
      cmd/logger/target/console/console.go
  3. 10
      cmd/logger/utils.go

@ -119,16 +119,16 @@ func (f fatalMsg) pretty(msg string, args ...interface{}) {
ansiSaveAttributes()
// Print banner with or without the log tag
if !tagPrinted {
fmt.Print(logBanner)
c.Print(logBanner)
tagPrinted = true
} else {
fmt.Print(emptyBanner)
c.Print(emptyBanner)
}
// Restore the text color of the error message
ansiRestoreAttributes()
ansiMoveRight(bannerWidth)
// Continue error message printing
fmt.Println(line)
c.Println(line)
break
}
}

@ -25,6 +25,7 @@ import (
"github.com/minio/minio/cmd/logger"
"github.com/minio/minio/cmd/logger/message/log"
"github.com/minio/minio/pkg/color"
"github.com/minio/minio/pkg/console"
)
// Target implements loggerTarget to send log
@ -109,7 +110,7 @@ func (c *Target) Send(e interface{}, logKind string) error {
apiString, timeString, deploymentID, requestID, remoteHost, host, userAgent,
msg, tagString, strings.Join(trace, "\n"))
fmt.Println(output)
console.Println(output)
return nil
}

@ -19,6 +19,7 @@ package logger
import (
"fmt"
"regexp"
"runtime"
"github.com/minio/minio/pkg/color"
)
@ -32,18 +33,27 @@ func ansiEscape(format string, args ...interface{}) {
}
func ansiMoveRight(n int) {
if runtime.GOOS == "windows" {
return
}
if color.IsTerminal() {
ansiEscape("[%dC", n)
}
}
func ansiSaveAttributes() {
if runtime.GOOS == "windows" {
return
}
if color.IsTerminal() {
ansiEscape("7")
}
}
func ansiRestoreAttributes() {
if runtime.GOOS == "windows" {
return
}
if color.IsTerminal() {
ansiEscape("8")
}

Loading…
Cancel
Save