tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log: replace tmp with bytes.Buffer.AvailableBuffer (#29287)

Browse Source
This commit is contained in:
Aaron Chen 2024-03-19 18:25:30 +08:00 committed by GitHub
parent 15eb9773f9
commit ac6060a4c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
log/format.go
View File

@ -79,24 +79,18 @@ func (h *TerminalHandler) format(buf []byte, r slog.Record, usecolor bool) []byt
} }
func (h *TerminalHandler) formatAttributes(buf *bytes.Buffer, r slog.Record, color string) { func (h *TerminalHandler) formatAttributes(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('=')
} }
//val := FormatSlogValue(attr.Value, true, buf.AvailableBuffer()) val := FormatSlogValue(attr.Value, buf.AvailableBuffer())
val := FormatSlogValue(attr.Value, tmp[:0])
padding := h.fieldPadding[attr.Key] padding := h.fieldPadding[attr.Key]