diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-02-28 00:05:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-28 00:05:50 +0800 |
| commit | 48bc07ae976a7940f75adaa68a4ea3887f5fad6c (patch) | |
| tree | cf19edb8ed153797edc8da7772f6d7f0671c410b /log/format.go | |
| parent | e8b3e226124d2b0234c36ef2ca9221dc95c56a1a (diff) | |
| parent | d0eba23af373bb54b00b242ccee4239fc9afd873 (diff) | |
| download | go-tangerine-48bc07ae976a7940f75adaa68a4ea3887f5fad6c.tar go-tangerine-48bc07ae976a7940f75adaa68a4ea3887f5fad6c.tar.gz go-tangerine-48bc07ae976a7940f75adaa68a4ea3887f5fad6c.tar.bz2 go-tangerine-48bc07ae976a7940f75adaa68a4ea3887f5fad6c.tar.lz go-tangerine-48bc07ae976a7940f75adaa68a4ea3887f5fad6c.tar.xz go-tangerine-48bc07ae976a7940f75adaa68a4ea3887f5fad6c.tar.zst go-tangerine-48bc07ae976a7940f75adaa68a4ea3887f5fad6c.zip | |
Merge pull request #3708 from fjl/log-letter
log: fix annoyances
Diffstat (limited to 'log/format.go')
| -rw-r--r-- | log/format.go | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/log/format.go b/log/format.go index 2a3790501..f32fcf744 100644 --- a/log/format.go +++ b/log/format.go @@ -69,26 +69,28 @@ 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{} - 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 +109,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 |