Fixes leak and Socket.disconnect() not calling onClose#112
Merged
dsrees merged 3 commits intodavidstump:masterfrom Aug 30, 2018
Merged
Conversation
Since connection.delegate is nil'd out, the Socket wasn't getting the `websocketDidDisconnect(socket:error:)` delegate message so it'd never call onClose callbacks. This also fixes an issue where the Socket would never be deinit'd because the current run loop had a strong reference to it (via the heartbeatTimer)
dsrees
requested changes
Aug 30, 2018
instead of relying on the `onConnectionClosed()` function. `onConnectionClosed()` does some additional things that we don't want (i.e. starting the reconnect timer) to happen when a Socket is explicitly disconnected.
Contributor
Author
|
@dsrees Thanks for taking the time to review this! I've made the changes & added a test for this. |
dsrees
approved these changes
Aug 30, 2018
Collaborator
dsrees
left a comment
dsrees
left a comment
There was a problem hiding this comment.
Awesome! Thanks for the fix
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #110, specifically:
Socketmay "leak" even after disconnected, because aTimerholds a strong reference to it, even afterdisconnect()is calledonClosewas being fired because theconnection.delegategets set tonilI'm not 100% sure calling
onConnectionClosed()is the right option here though, as there may be unintended side effects (like the autoreconnect timer starting) @davidstump thoughts?