-
-
Notifications
You must be signed in to change notification settings - Fork 57
Include information from LogEvent.error in log output if present #245
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
Open
samuelmurray
wants to merge
4
commits into
vapor:main
Choose a base branch
from
samuelmurray:error-log-parameter
base: main
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
Show all changes
4 commits
Select commit
Hold shift + click to select a range
6a91819
Include information from LogEvent.error in log output if present
samuelmurray 0c33be5
fixup! Include information from LogEvent.error in log output if present
samuelmurray 57a5041
Merge branch 'main' into error-log-parameter
fpseverino 06f1890
Serialize error in MetadataFragment instead of new ErrorFragment
samuelmurray 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 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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -259,18 +259,22 @@ public struct MessageFragment: LoggerFragment { | |
| } | ||
| } | ||
|
|
||
| /// Writes the combined metadata to the output, and requests a separator for the next fragment only if the metadata was not empty. | ||
| /// Writes the combined metadata (including the logged error) to the output, and requests a separator for the next fragment only if the metadata was not empty. | ||
| /// | ||
| /// This fragment is considered to not have content if the metadata is empty. | ||
| public struct MetadataFragment: LoggerFragment { | ||
| public init() {} | ||
|
|
||
| public func hasContent(record: inout LogRecord) -> Bool { | ||
| !record.allMetadata().isEmpty | ||
| !record.allMetadata().isEmpty || record.error != nil | ||
| } | ||
|
|
||
| public func write(_ record: inout LogRecord, to output: inout FragmentOutput) { | ||
| let allMetadata = record.allMetadata() | ||
| var allMetadata = record.allMetadata() | ||
| if let error = record.error { | ||
| allMetadata["error.message"] = "\(error)" | ||
| allMetadata["error.type"] = "\(String(reflecting: type(of: error)))" | ||
| } | ||
|
Comment on lines
+273
to
+277
Author
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. Would you prefer to instead have this be part of |
||
|
|
||
| guard !allMetadata.isEmpty else { return } | ||
|
|
||
|
|
||
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
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
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.
I'm assuming breaking changes are ok, since it's a beta release?