Skip to content

[ServiceBus] update ValueError to AMQPConnectionError for closed connection #34786

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
swathipil merged 2 commits into from
Mar 18, 2024
Merged

[ServiceBus] update ValueError to AMQPConnectionError for closed connection #34786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5465dba
update ValueError to AMQPConnectionError for closed connection
swathipil Mar 15, 2024
9bb6981
revert socket closed message
swathipil Mar 18, 2024
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
5 changes: 4 additions & 1 deletion sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,10 @@ def _process_outgoing_frame(self, channel: int, frame) -> None:
ConnectionState.OPEN_SENT,
ConnectionState.OPENED,
]:
raise ValueError("Connection not open.")
raise AMQPConnectionError(
ErrorCondition.SocketError,
description="Connection not open."
)
now = time.time()
if get_local_timeout(
now,
Expand Down
8 changes: 6 additions & 2 deletions sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/_transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,11 @@ def _write(self, s):
"""Write a string out to the SSL socket fully.
:param str s: The string to write.
"""
write = self.sock.send
try:
write = self.sock.send
except AttributeError:
raise IOError("Socket has already been closed.") from None

while s:
try:
n = write(s)
Expand All @@ -659,7 +663,7 @@ def _write(self, s):
# None.
n = 0
if not n:
raise IOError("Socket closed")
raise IOError("Socket closed.")
s = s[n:]

def negotiate(self):
Expand Down
5 changes: 4 additions & 1 deletion sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/aio/_connection_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,10 @@ async def _process_outgoing_frame(self, channel: int, frame) -> None:
ConnectionState.OPEN_SENT,
ConnectionState.OPENED,
]:
raise ValueError("Connection not open.")
raise AMQPConnectionError(
ErrorCondition.SocketError,
description="Connection not open."
)
now = time.time()
if get_local_timeout(
now,
Expand Down