Fix double closure of sockets for websocket_agent #334
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
At websocket_agent, wsWrapper.Close() is executed twice, at deferred function and inside go routine. Call wsWrapper.Close() only at go routine that writes data to the wsWrapper. Also move tcpConn.Close() after io.Copy(...) to avoid confusion.
k311093
requested review from
jemoreira,
ser-io,
jmacnak,
rmuthiah,
adelva1984 and
Databean
as code owners
jemoreira
requested changes
Jul 17, 2024
| go func() { | ||
| io.Copy(wsWrapper, tcpConn) | ||
| wsWrapper.Close() | ||
| }() | ||
| io.Copy(tcpConn, wsWrapper) | ||
| tcpConn.Close() |
There was a problem hiding this comment.
This one should stay as it was, with the defer in line 1275. It has the same effect of closing at the end of the function, but with the added benefit of closing the socket even with an early return in case of errors.
I wrongly suggested before that this one needed fixing because I had the order of parameters to io.Copy inverted. Sorry about that.
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.
At websocket_agent, wsWrapper.Close() is executed twice, at deferred function and inside go routine. Call wsWrapper.Close() only at go routine that writes data to the wsWrapper.
Also move tcpConn.Close() after io.Copy(...) to avoid confusion.