swarm: log unexpected listener errors #2277
Merged
Conversation
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
marten-seemann
approved these changes
May 9, 2023
p2p/net/swarm/swarm_listen.go
Outdated
| @@ -127,6 +127,9 @@ func (s *Swarm) AddListenAddr(a ma.Multiaddr) error { | |||
| for { | |||
| c, err := list.Accept() | |||
| if err != nil { | |||
| if err != transport.ErrListenerClosed { | |||
| @@ -152,8 +153,7 @@ func TestAcceptErrorGetCleanedUp(t *testing.T) { | |||
| require.NoError(t, err) | |||
| defer l.Close() | |||
| _, err = l.Accept(context.Background()) | |||
| require.EqualError(t, err, "accept goroutine finished") | |||
|
|
|||
| require.Equal(t, err, transport.ErrListenerClosed) | |||
p2p/transport/quicreuse/listener.go
Outdated
| @@ -134,6 +136,9 @@ func (l *connListener) Run() error { | |||
| for { | |||
| conn, err := l.l.Accept(context.Background()) | |||
| if err != nil { | |||
| if err == quic.ErrServerClosed || strings.Contains(err.Error(), "use of closed network connection") { | |||
p2p/net/swarm/swarm_listen.go
Outdated
| @@ -127,6 +127,9 @@ func (s *Swarm) AddListenAddr(a ma.Multiaddr) error { | |||
| for { | |||
| c, err := list.Accept() | |||
| if err != nil { | |||
| if err != transport.ErrListenerClosed { | |||
| log.Error("swarm listener accept error: ", err) | |||
There was a problem hiding this comment.
Should this include which listener this is? For example:
Suggested change
| log.Error("swarm listener accept error: ", err) | |
| log.Errorf("swarm listener for %s accept error: %s", a, err) |
There was a problem hiding this comment.
What do you think about using "%T" to print the type? I think it'll be more useful than trying to print the fields on some unknown struct.
There was a problem hiding this comment.
What fields of an unknown struct? a is the multiaddr.
There was a problem hiding this comment.
You're right. I misread this as log.Errorf("swarm listener %s accept error: %s", list, err). That makes sense.
marten-seemann
approved these changes
May 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #2264