Skip to content

Improvement: Use shutdown() Before close() in connection.py #3567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 26, 2025
Merged

Improvement: Use shutdown() Before close() in connection.py #3567

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d5c3428
fix: add socket shutdown before close for proper termination
allrob23 Mar 19, 2025
42390e2
Merge branch 'master' into patch-socker-close
petyaslavova Mar 20, 2025
710078d
Merge branch 'master' into patch-socker-close
petyaslavova Mar 25, 2025
9af8795
fix: avoid bare except
allrob23 Mar 25, 2025
4d9289e
fix: avoid bare except
allrob23 Mar 25, 2025
1d673dc
fix: remove whitespace
allrob23 Mar 25, 2025
90cb2f3
Merge branch 'master' into patch-socker-close
allrob23 Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions redis/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,10 @@ def _connect(self):
except OSError as _:
err = _
if sock is not None:
try:
sock.shutdown(socket.SHUT_RDWR) # ensure a clean close
except OSError:
pass
sock.close()

if err is not None:
Expand Down Expand Up @@ -1179,6 +1183,10 @@ def _connect(self):
sock.connect(self.path)
except OSError:
# Prevent ResourceWarnings for unclosed sockets.
try:
sock.shutdown(socket.SHUT_RDWR) # ensure a clean close
except OSError:
pass
sock.close()
raise
sock.settimeout(self.socket_timeout)
Expand Down
Loading