aboutsummaryrefslogtreecommitdiffstats
path: root/log/format.go
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-02-27 23:06:40 +0800
committerPéter Szilágyi <peterke@gmail.com>2017-02-28 01:15:18 +0800
commit2f28a12cdbee3e5c48ca5f44b128e639c60f3685 (patch)
treeedb2f3a023600bcff5ff668229fc9cf2c114e18c /log/format.go
parentfc97c7a38dc5193ef5e32de42235b6facf609c41 (diff)
downloaddexon-2f28a12cdbee3e5c48ca5f44b128e639c60f3685.tar
dexon-2f28a12cdbee3e5c48ca5f44b128e639c60f3685.tar.gz
dexon-2f28a12cdbee3e5c48ca5f44b128e639c60f3685.tar.bz2
dexon-2f28a12cdbee3e5c48ca5f44b128e639c60f3685.tar.lz
dexon-2f28a12cdbee3e5c48ca5f44b128e639c60f3685.tar.xz
dexon-2f28a12cdbee3e5c48ca5f44b128e639c60f3685.tar.zst
dexon-2f28a12cdbee3e5c48ca5f44b128e639c60f3685.zip
common, eth/downloader, log: support terminal log formatting
Diffstat (limited to 'log/format.go')
-rw-r--r--log/format.go25
1 files changed, 19 insertions, 6 deletions
diff --git a/log/format.go b/log/format.go
index f32fcf744..e8f4b4f24 100644
--- a/log/format.go
+++ b/log/format.go
@@ -59,6 +59,13 @@ func (f formatFunc) Format(r *Record) []byte {
return f(r)
}
+// TerminalStringer is an analogous interface to the stdlib stringer, allowing
+// own types to have custom shortened serialization formats when printed to the
+// screen.
+type TerminalStringer interface {
+ TerminalString() string
+}
+
// TerminalFormat formats log records optimized for human readability on
// a terminal with color-coded level output and terser human friendly timestamp.
// This format should only be used for interactive programs or while developing.
@@ -124,7 +131,7 @@ func TerminalFormat(usecolor bool) Format {
}
// print the keys logfmt style
- logfmt(b, r.Ctx, color)
+ logfmt(b, r.Ctx, color, true)
return b.Bytes()
})
}
@@ -138,21 +145,21 @@ func LogfmtFormat() Format {
return FormatFunc(func(r *Record) []byte {
common := []interface{}{r.KeyNames.Time, r.Time, r.KeyNames.Lvl, r.Lvl, r.KeyNames.Msg, r.Msg}
buf := &bytes.Buffer{}
- logfmt(buf, append(common, r.Ctx...), 0)
+ logfmt(buf, append(common, r.Ctx...), 0, false)
return buf.Bytes()
})
}
-func logfmt(buf *bytes.Buffer, ctx []interface{}, color int) {
+func logfmt(buf *bytes.Buffer, ctx []interface{}, color int, term bool) {
for i := 0; i < len(ctx); i += 2 {
if i != 0 {
buf.WriteByte(' ')
}
k, ok := ctx[i].(string)
- v := formatLogfmtValue(ctx[i+1])
+ v := formatLogfmtValue(ctx[i+1], term)
if !ok {
- k, v = errorKey, formatLogfmtValue(k)
+ k, v = errorKey, formatLogfmtValue(k, term)
}
// XXX: we should probably check that all of your key bytes aren't invalid
@@ -253,7 +260,7 @@ func formatJsonValue(value interface{}) interface{} {
}
// formatValue formats a value for serialization
-func formatLogfmtValue(value interface{}) string {
+func formatLogfmtValue(value interface{}, term bool) string {
if value == nil {
return "nil"
}
@@ -264,6 +271,12 @@ func formatLogfmtValue(value interface{}) string {
// expensive.
return t.Format(timeFormat)
}
+ if term {
+ if s, ok := value.(TerminalStringer); ok {
+ // Custom terminal stringer provided, use that
+ return escapeString(s.TerminalString())
+ }
+ }
value = formatShared(value)
switch v := value.(type) {
case bool: