forked from cerc-io/plugeth
log: log full level names instead of mispelled "EROR", "DBUG"
This commit is contained in:
parent
e8b3e22612
commit
38e273597c
@ -88,7 +88,7 @@ func TerminalFormat() Format {
|
|||||||
}
|
}
|
||||||
|
|
||||||
b := &bytes.Buffer{}
|
b := &bytes.Buffer{}
|
||||||
lvl := strings.ToUpper(r.Lvl.String())
|
lvl := r.Lvl.AlignedString()
|
||||||
if atomic.LoadUint32(&locationEnabled) != 0 {
|
if atomic.LoadUint32(&locationEnabled) != 0 {
|
||||||
// Log origin printing was requested, format the location path and line number
|
// Log origin printing was requested, format the location path and line number
|
||||||
location := fmt.Sprintf("%+v", r.Call)
|
location := fmt.Sprintf("%+v", r.Call)
|
||||||
@ -107,13 +107,13 @@ func TerminalFormat() Format {
|
|||||||
if color > 0 {
|
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)
|
fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%s|%s]%s %s ", color, lvl, r.Time.Format(termTimeFormat), location, padding, r.Msg)
|
||||||
} else {
|
} 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 {
|
} else {
|
||||||
if color > 0 {
|
if color > 0 {
|
||||||
fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%s] %s ", color, lvl, r.Time.Format(termTimeFormat), r.Msg)
|
fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%s] %s ", color, lvl, r.Time.Format(termTimeFormat), r.Msg)
|
||||||
} else {
|
} 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
|
// try to justify the log output for short messages
|
||||||
|
@ -24,7 +24,27 @@ const (
|
|||||||
LvlTrace
|
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 {
|
func (l Lvl) String() string {
|
||||||
switch l {
|
switch l {
|
||||||
case LvlTrace:
|
case LvlTrace:
|
||||||
|
Loading…
Reference in New Issue
Block a user