Change Events#ssl_error signature from (error, peeraddr, peercert) to (error, ssl_socket) #2375
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
nateberkopec
requested changes
Sep 22, 2020
| def ssl_error(error, peeraddr, peercert) | ||
| def ssl_error(error, ssl_socket) | ||
| addr = ssl_socket.peeraddr.last rescue "<unknown>" | ||
| peercert = ssl_socket.peercert | ||
| subject = peercert ? peercert.subject : nil | ||
| @error_logger.info(error: error, text: "SSL error, peer: #{peeraddr}, peer cert: #{subject}") |
There was a problem hiding this comment.
peeraddr is undefined. did you mean to change this line to peer: #{addr}?
There was a problem hiding this comment.
You're being too nice. Actually, I'm changing addr on line 113 to peeraddr. More importantly, I'm adding a test (bad assumption on my part). Give me a minute...
There was a problem hiding this comment.
Fixed and added a test. Thanks.
nateberkopec
added
waiting-for-changes
… (error, ssl_socket) The method signature should include the socket, so it determines what socket info is logged Co-authored-by: ocowchun <ocowchun@gmail.com>
MSP-Greg
force-pushed
the
events-ssl-error
branch
from
4633725
to
c244fb7
Compare
nateberkopec
added
waiting-for-review
|
Nice to see @ocowchun on the co-author there, nice touch. Co-authoring is underused! |
|
Haha, Thanks, but I don't think I deserve the credit. Still, I wish I can have more contribution to puma in the future. |
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.
Description
The method signature should include the socket, so it determines what socket info is logged, and also so it can catch exceptions.
Closes #2335, closes #2367
Your checklist for this pull request
[changelog skip]or[ci skip]to the pull request title.[ci skip]to the title of the PR.#issue" to the PR description or my commit messages.