From 38e273597c283e607fd58199ed77890813f7c22c Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Thu, 23 Feb 2017 18:30:32 +0100 Subject: log: log full level names instead of mispelled "EROR", "DBUG" --- log/format.go | 6 +++--- log/logger.go | 22 +++++++++++++++++++++- 2 files changed, 24 insertions(+), 4 deletions(-) (limited to 'log') diff --git a/log/format.go b/log/format.go index 2a3790501..c61a4d82a 100644 --- a/log/format.go +++ b/log/format.go @@ -88,7 +88,7 @@ func TerminalFormat() Format { } b := &bytes.Buffer{} - lvl := strings.ToUpper(r.Lvl.String()) + lvl := r.Lvl.AlignedString() if atomic.LoadUint32(&locationEnabled) != 0 { // Log origin printing was requested, format the location path and line number location := fmt.Sprintf("%+v", r.Call) @@ -107,13 +107,13 @@ func TerminalFormat() Format { if color > 0 { fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%s|%s]%s %s ", color, lvl, r.Time.Format(termTimeFormat), location, padding, r.Msg) } else { - fmt.Fprintf(b, "[%s] [%s|%s]%s %s ", lvl, r.Time.Format(termTimeFormat), location, padding, r.Msg) + fmt.Fprintf(b, "%s[%s|%s]%s %s ", lvl, r.Time.Format(termTimeFormat), location, padding, r.Msg) } } else { if color > 0 { fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%s] %s ", color, lvl, r.Time.Format(termTimeFormat), r.Msg) } else { - fmt.Fprintf(b, "[%s] [%s] %s ", lvl, r.Time.Format(termTimeFormat), r.Msg) + fmt.Fprintf(b, "%s[%s] %s ", lvl, r.Time.Format(termTimeFormat), r.Msg) } } // try to justify the log output for short messages diff --git a/log/logger.go b/log/logger.go index a7f7d9df7..15c83a9b2 100644 --- a/log/logger.go +++ b/log/logger.go @@ -24,7 +24,27 @@ const ( LvlTrace ) -// Returns the name of a Lvl +// Aligned returns a 5-character string containing the name of a Lvl. +func (l Lvl) AlignedString() string { + switch l { + case LvlTrace: + return "TRACE" + case LvlDebug: + return "DEBUG" + case LvlInfo: + return "INFO " + case LvlWarn: + return "WARN " + case LvlError: + return "ERROR" + case LvlCrit: + return "CRIT " + default: + panic("bad level") + } +} + +// Strings returns the name of a Lvl. func (l Lvl) String() string { switch l { case LvlTrace: -- cgit v1.2.3 From 43362ab4fb561323e1a766405eaa8f82dec4a280 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Thu, 23 Feb 2017 18:42:42 +0100 Subject: log: disable logs by default --- log/root.go | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'log') diff --git a/log/root.go b/log/root.go index 12afbf8b7..71b8cef6d 100644 --- a/log/root.go +++ b/log/root.go @@ -2,28 +2,16 @@ package log import ( "os" - - "github.com/ethereum/go-ethereum/log/term" - "github.com/mattn/go-colorable" ) var ( - root *logger + root = &logger{[]interface{}{}, new(swapHandler)} StdoutHandler = StreamHandler(os.Stdout, LogfmtFormat()) StderrHandler = StreamHandler(os.Stderr, LogfmtFormat()) ) func init() { - if term.IsTty(os.Stdout.Fd()) { - StdoutHandler = StreamHandler(colorable.NewColorableStdout(), TerminalFormat()) - } - - if term.IsTty(os.Stderr.Fd()) { - StderrHandler = StreamHandler(colorable.NewColorableStderr(), TerminalFormat()) - } - - root = &logger{[]interface{}{}, new(swapHandler)} - root.SetHandler(LvlFilterHandler(LvlInfo, StdoutHandler)) + root.SetHandler(DiscardHandler()) } // New returns a new logger with the given context. -- cgit v1.2.3 From d0eba23af373bb54b00b242ccee4239fc9afd873 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Thu, 23 Feb 2017 19:31:13 +0100 Subject: all: disable log message colors outside of geth Also tweak behaviour so colors are only enabled when stderr is a terminal. --- log/format.go | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'log') diff --git a/log/format.go b/log/format.go index c61a4d82a..f32fcf744 100644 --- a/log/format.go +++ b/log/format.go @@ -69,22 +69,24 @@ func (f formatFunc) Format(r *Record) []byte { // // [May 16 20:58:45] [DBUG] remove route ns=haproxy addr=127.0.0.1:50002 // -func TerminalFormat() Format { +func TerminalFormat(usecolor bool) Format { return FormatFunc(func(r *Record) []byte { var color = 0 - switch r.Lvl { - case LvlCrit: - color = 35 - case LvlError: - color = 31 - case LvlWarn: - color = 33 - case LvlInfo: - color = 32 - case LvlDebug: - color = 36 - case LvlTrace: - color = 34 + if usecolor { + switch r.Lvl { + case LvlCrit: + color = 35 + case LvlError: + color = 31 + case LvlWarn: + color = 33 + case LvlInfo: + color = 32 + case LvlDebug: + color = 36 + case LvlTrace: + color = 34 + } } b := &bytes.Buffer{} -- cgit v1.2.3