close Connection socket after server disconnect #1552
Merged
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.
This is similar to: redis/redis-py#1797
Currently, calibre/srv/loop.py's
Connection.close()
won't continue to close the socket if it encounters anOSError
onsocket.shutdown
. AnOSError
can happen onsocket.shutdown
if the other side of the connection disconnected already. Not runningsocket.close
prevents garbage collection from cleaning up the socket and will use more memory than necessary (maybe even causing a leak?).This PR puts a separate try/except around
socket.close
andsocket.shutdown
to allow the socket to be closed after a failed shutdown.