🧵 Close socket in #disconnect before waiting for lock & thread join#493
Merged
Conversation
If `disconnected?` returns true, the connection state is most likely already `logout`. But, just in case, we'll ensure it's set every time.
Net::IMAP#disconnect will still attempt to enter the logout state first, but it won't wait for the lock until after the socket has been shutdown.
The reciever thread should close the connection before it finishes, and `@sock.shutdown` should've been enough to trigger that. But this ensures the socket is closed right away, without needing to wait on whatever the receiver thread might be in the middle of doing.
It should always be safe to call `@sock.close` without external synchronization. And synchronizing here with could get stuck waiting e.g. for a response_handler looping in the receiver thread.
This should work both for TCPSocket and for OpenSSL::SSL::SSLSocket. Both will respond to `#to_io` with the TCPSocket.
nevans
force-pushed
the
synchronize-disconnect-logout
branch
from
b17de74 to
0c919fb
Compare
nevans
changed the title
#disconnect to close the socket before waiting on locks or receiver thread#disconnect before waiting for lock & thread join
nevans
added a commit
that referenced
this pull request
Jul 2, 2026
The reciever thread should close the connection before it finishes, and `@sock.shutdown` should've been enough to trigger that. But this ensures the socket is closed right away, without needing to wait on whatever the receiver thread might be in the middle of doing.
nevans
added a commit
that referenced
this pull request
Jul 2, 2026
nevans
added a commit
that referenced
this pull request
Jul 2, 2026
nevans
added a commit
that referenced
this pull request
Jul 2, 2026
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
1 participant
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.
While attempting to get the tests running under JRuby,
#disconnectwould sometimes deadlock. So, although I haven't seen that problem elsewhere and JRuby is still failing tests with another threading issue, this (and #494) did get most tests passing for me (but not in CI).This updates
#disconnectso that the socket is shutdown and closed before joining the receiver thread and before waiting for the lock to changeconnection_state(It will still attempt to changeconnection_statebefore closing the socket, but it won't wait if the lock isn't available).