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
adding logging around libp2p one-to-one stream management #785
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
2cc9878
adding logging around libp2p one-to-one stream management
vishalchangrani 28fddbb
moving streamLogger function to libp2pUtils.go
vishalchangrani 076eb0f
Merge branch 'master' into vishal/adding_reset_logging
vishalchangrani af9bacb
Merge branch 'master' into vishal/adding_reset_logging
vishalchangrani File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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
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
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 |
---|---|---|
|
@@ -37,13 +37,11 @@ func newReadConnection(ctx context.Context, | |
maxMsgSize = DefaultMaxUnicastMsgSize | ||
} | ||
|
||
streamLogger := streamLogger(log, stream) | ||
|
||
c := readConnection{ | ||
ctx: ctx, | ||
stream: stream, | ||
callback: callback, | ||
log: streamLogger, | ||
log: log, | ||
metrics: metrics, | ||
maxMsgSize: maxMsgSize, | ||
} | ||
|
@@ -79,7 +77,7 @@ func (rc *readConnection) receiveLoop(wg *sync.WaitGroup) { | |
rc.closeStream() | ||
return | ||
} | ||
rc.log.Error().Err(err) | ||
rc.log.Error().Err(err).Msg("failed to read message") | ||
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. logger won't print log if there is no |
||
rc.resetStream() | ||
return | ||
} | ||
|
@@ -120,12 +118,3 @@ func (rc *readConnection) resetStream() { | |
rc.log.Error().Err(err).Msg("failed to reset stream") | ||
} | ||
} | ||
|
||
func streamLogger(log zerolog.Logger, stream libp2pnetwork.Stream) zerolog.Logger { | ||
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. moved this to |
||
logger := log.With(). | ||
Str("remote_peer", stream.Conn().RemotePeer().String()). | ||
Str("remote_address", stream.Conn().RemoteMultiaddr().String()). | ||
Str("local_peer", stream.Conn().LocalPeer().String()). | ||
Str("local_address", stream.Conn().LocalMultiaddr().String()).Logger() | ||
return logger | ||
} |
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.
identity gives IP address in addition to node id.