Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

consoleEncoder: put cloned jsonEncoder back to pool #852

Merged
merged 2 commits into from
Aug 5, 2020
Merged

consoleEncoder: put cloned jsonEncoder back to pool #852

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b59b9c
consoleEncoder: put cloned jsonEncoder back to pool (#851)
wyxloading Jul 28, 2020
48ec7aa
chore: add comments
wyxloading Jul 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion zapcore/console_encoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,12 @@ func (c consoleEncoder) EncodeEntry(ent Entry, fields []Field) (*buffer.Buffer,

func (c consoleEncoder) writeContext(line *buffer.Buffer, extra []Field) {
context := c.jsonEncoder.Clone().(*jsonEncoder)
defer context.buf.Free()
defer func() {
// putJSONEncoder assumes the buffer is still used, but we write out the buffer so
// we can free it.
context.buf.Free()
wyxloading marked this conversation as resolved.
Show resolved Hide resolved
putJSONEncoder(context)
}()

addFields(context, extra)
context.closeOpenNamespaces()
Expand Down