forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: avoid using go 1.21-specific features

Browse source
This commit is contained in:
Martin Holst Swende 2023-11-29 10:16:47 +01:00
parent d2251afece
commit b7933d28e7
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
log/format.go
View file

@ -95,22 +95,25 @@ func (h *TerminalHandler) TerminalFormat(buf []byte, r slog.Record, usecolor boo
} }
func (h *TerminalHandler) logfmt(buf *bytes.Buffer, r slog.Record, color string) { func (h *TerminalHandler) logfmt(buf *bytes.Buffer, r slog.Record, color string) {
// tmp is a temporary buffer we use, until bytes.Buffer.AvailableBuffer() (1.21)
// can be used.
var tmp = make([]byte, 40)
writeAttr := func(attr slog.Attr, first, last bool) { writeAttr := func(attr slog.Attr, first, last bool) {
buf.WriteByte(' ') buf.WriteByte(' ')
if color != "" { if color != "" {
buf.WriteString(color) buf.WriteString(color)
buf.Write(appendEscapeString(buf.AvailableBuffer(), attr.Key)) //buf.Write(appendEscapeString(buf.AvailableBuffer(), attr.Key))
buf.Write(appendEscapeString(tmp[:0], attr.Key))
buf.WriteString("\x1b[0m=") buf.WriteString("\x1b[0m=")
} else { } else {
buf.Write(appendEscapeString(buf.AvailableBuffer(), attr.Key)) //buf.Write(appendEscapeString(buf.AvailableBuffer(), attr.Key))
buf.Write(appendEscapeString(tmp[:0], attr.Key))
buf.WriteByte('=') buf.WriteByte('=')
} }
tmp := buf.AvailableBuffer() //val := FormatSlogValue(attr.Value, true, buf.AvailableBuffer())
val := FormatSlogValue(attr.Value, true, tmp) val := FormatSlogValue(attr.Value, true, tmp[:0])
// XXX: we should probably check that all of your key bytes aren't invalid
// TODO (jwasinger) above comment was from log15 code. what does it mean? check that key bytes are ascii characters?
padding := h.fieldPadding[attr.Key] padding := h.fieldPadding[attr.Key]
length := utf8.RuneCount(val) length := utf8.RuneCount(val)