-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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.
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
Add ExcludeKey option to TextFormatter #1433
Open
ningyougang
wants to merge
1
commit into
sirupsen:master
Choose a base branch
from
ningyougang:add-exclude-key-option
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,6 +28,10 @@ func init() { | |
|
||
// TextFormatter formats logs into text | ||
type TextFormatter struct { | ||
// Set to true if want the log not to contain the startingKey, e.g. | ||
// 0001-01-01T00:00:00Z warning message | ||
ExcludeKey bool | ||
|
||
// Set to true to bypass checking for a TTY before outputting colors. | ||
ForceColors bool | ||
|
||
|
@@ -320,8 +324,10 @@ func (f *TextFormatter) appendKeyValue(b *bytes.Buffer, key string, value interf | |
if b.Len() > 0 { | ||
b.WriteByte(' ') | ||
} | ||
b.WriteString(key) | ||
b.WriteByte('=') | ||
if !f.ExcludeKey { | ||
b.WriteString(key) | ||
b.WriteByte('=') | ||
} | ||
f.appendValue(b, value) | ||
} | ||
|
||
|
@@ -331,9 +337,14 @@ func (f *TextFormatter) appendValue(b *bytes.Buffer, value interface{}) { | |
stringVal = fmt.Sprint(value) | ||
} | ||
|
||
if !f.needsQuoting(stringVal) { | ||
// write value without quoting directly when ExcludeKey is true | ||
if f.ExcludeKey { | ||
b.WriteString(stringVal) | ||
} else { | ||
b.WriteString(fmt.Sprintf("%q", stringVal)) | ||
if !f.needsQuoting(stringVal) { | ||
b.WriteString(stringVal) | ||
} else { | ||
b.WriteString(fmt.Sprintf("%q", stringVal)) | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Keep the same logic as before when ExcludeKey is false(this is default) |
||
} | ||
} |
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If configure ExcludeKey as true, just write value without quoting directly, otherwise, the logs will be as below