middleware: honour NoColor in defaultLogEntry.Panic#1086
Open
alliasgher wants to merge 2 commits intogo-chi:masterfrom
Open
middleware: honour NoColor in defaultLogEntry.Panic#1086alliasgher wants to merge 2 commits intogo-chi:masterfrom
alliasgher wants to merge 2 commits intogo-chi:masterfrom
Conversation
When a Tee writer is set, ReadFrom calls io.Copy(&f.basicWriter, r),
which routes each write through basicWriter.Write. Write already
increments basicWriter.bytes, so the line
f.basicWriter.bytes += int(n)
that followed the io.Copy double-counted every byte, causing
BytesWritten() to return twice the actual value.
Remove the redundant addition. The non-tee path is unaffected because
it delegates to the underlying ResponseWriter's ReaderFrom (bypassing
Write) and must still add n itself.
Fixes go-chi#1067
Signed-off-by: alliasgher <alliasgher123@gmail.com>
defaultLogEntry.Panic called PrintPrettyStack unconditionally, which always used ANSI colour codes regardless of the DefaultLogFormatter's NoColor field. Add PrintPrettyStackColor(rvr, useColor bool) and thread the flag through prettyStack.parse. PrintPrettyStack now delegates to it with useColor=true so existing callers are unaffected. defaultLogEntry.Panic passes l.useColor so the panic output respects the same flag that controls the rest of the request log. Fixes go-chi#1042 Signed-off-by: alliasgher <alliasgher123@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
defaultLogEntry.PaniccalledPrintPrettyStackunconditionally. That function hardcodesuseColor := true, so the panic stack trace was always printed with ANSI colour codes even whenDefaultLogFormatter.NoColorwas set totrue.Fix
PrintPrettyStackColor(rvr interface{}, useColor bool)that accepts an explicit colour flag.PrintPrettyStackto delegate to it withuseColor=true— no change for existing callers.prettyStack.parseto receiveuseColorrather than hardcode it.defaultLogEntry.Panicnow passesl.useColor, which is derived fromDefaultLogFormatter.NoColor.Fixes #1042