Log TCP acceptor (Ranch) timeout and TLS [handshake-related] errors #13979
Conversation
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
lhoguin
requested changes
May 29, 2025
| Protocol = ranch_ref_to_protocol(Ref), | ||
| rabbit_log:error("~p error during handshake for protocol ~p and peer ~ts", | ||
| [Reason, Protocol, PeerAddress]), | ||
| exit({shutdown, {Reason, PeerInfo}}) |
There was a problem hiding this comment.
It's better in both catch cases to call erlang:raise/3 so that we don't lose the stacktrace which may be propagated to other processes.
| @@ -547,7 +562,7 @@ failed_to_recv_proxy_header(Ref, Error) -> | |||
| end, | |||
| rabbit_log:debug(Msg, [Error]), | |||
| % The following call will clean up resources then exit | |||
| _ = ranch:handshake(Ref), | |||
| _ = catch ranch:handshake(Ref), | |||
There was a problem hiding this comment.
This way of doing catch is being deprecated by Erlang/OTP team so it would be better as a try catch.
| try_ranch_handshake(Ref) -> | ||
| try ranch:handshake(Ref) of | ||
| {ok, Sock} -> | ||
| Sock |
There was a problem hiding this comment.
There's no reason no to return {ok, Sock}. You could also use the name ranch_handshake as the "try" doesn't tell us much.
bc8023b to
223ef6d
Compare
223ef6d to
3a5dc94
Compare
lhoguin
approved these changes
May 30, 2025
michaelklishin
approved these changes
May 30, 2025
|
The failures are not specific to this PR. |
12 tasks
michaelklishin
added a commit
that referenced
this pull request
May 30, 2025
Log TCP acceptor (Ranch) timeout and TLS [handshake-related] errors (backport #13979)
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.
Proposed Changes
This PR addresses #11171
The proposed changes catch the exit signal emitted by
ranch:handshakeinrabbit_networking:handshakeand log an error message in case the reason for shutting down the connection is other thanclosed.The reason for not logging
closedshutdown exit exceptions has been added as a context comment in the source.Types of Changes
Checklist
Put an
xin the boxes that apply.You can also fill these out after creating the PR.
If you're unsure about any of them, don't hesitate to ask on the mailing list.
We're here to help!
This is simply a reminder of what we are going to look for before merging your code.
CONTRIBUTING.mddocumentFurther Comments