Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/commands/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ func setupLogger(logger logutils.Log) error {
logger.Fatalf("invalid value %q for --color; must be 'always', 'auto', or 'never'", opts.Color)
}

// For log level colors (mainly for verbose output)
logutils.DisableColors(color.NoColor)

return nil
}

Expand Down
36 changes: 24 additions & 12 deletions pkg/logutils/stderr_log.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ const (
envLogTimestamp = "LOG_TIMESTAMP"
)

var _ Log = NewStderrLog(DebugKeyEmpty)

type StderrLog struct {
name string
logger *logrus.Logger
level LogLevel
}

var _ Log = NewStderrLog(DebugKeyEmpty)

func NewStderrLog(name string) *StderrLog {
sl := &StderrLog{
name: name,
Expand All @@ -44,16 +44,7 @@ func NewStderrLog(name string) *StderrLog {
}

sl.logger.Out = StdErr
formatter := &logrus.TextFormatter{
DisableTimestamp: true, // `INFO[0007] msg` -> `INFO msg`
EnvironmentOverrideColors: true,
}
if os.Getenv(envLogTimestamp) == "1" {
formatter.DisableTimestamp = false
formatter.FullTimestamp = true
formatter.TimestampFormat = time.StampMilli
}
sl.logger.Formatter = formatter
sl.logger.Formatter = logFormatter

return sl
}
Expand Down Expand Up @@ -127,3 +118,24 @@ func (sl StderrLog) Child(name string) Log {
func (sl *StderrLog) SetLevel(level LogLevel) {
sl.level = level
}

var logFormatter = newLogFormatter()

func DisableColors(disable bool) {
logFormatter.DisableColors = disable
}

func newLogFormatter() *logrus.TextFormatter {
formatter := &logrus.TextFormatter{
DisableTimestamp: true, // `INFO[0007] msg` -> `INFO msg`
EnvironmentOverrideColors: true,
}

if os.Getenv(envLogTimestamp) == "1" {
formatter.DisableTimestamp = false
formatter.FullTimestamp = true
formatter.TimestampFormat = time.StampMilli
}

return formatter
}
Loading