Skip to content

Commit 5fd2c52

Browse files
authored
[SB] Catch websocket exception (#34859)
* catch wb except * Update sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/_transport.py * eh
1 parent d2e868c commit 5fd2c52

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

sdk/eventhub/azure-eventhub/azure/eventhub/_pyamqp/_transport.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ def _read(self, n, initial=False, buffer=None, _errnos=None): # pylint: disable
771771
:return: The data read.
772772
:rtype: bytearray
773773
"""
774-
from websocket import WebSocketTimeoutException
774+
from websocket import WebSocketTimeoutException, WebSocketConnectionClosedException
775775
try:
776776
length = 0
777777
view = buffer or memoryview(bytearray(n))
@@ -794,6 +794,8 @@ def _read(self, n, initial=False, buffer=None, _errnos=None): # pylint: disable
794794
raise IOError("Websocket connection has already been closed.") from None
795795
except WebSocketTimeoutException as wte:
796796
raise TimeoutError('Websocket receive timed out (%s)' % wte) from wte
797+
except (WebSocketConnectionClosedException, SSLError) as e:
798+
raise ConnectionError('Websocket disconnected: %r' % e) from e
797799
except:
798800
self._read_buffer = BytesIO(view[:length])
799801
raise

sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/_transport.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ def _read(self, n, initial=False, buffer=None, _errnos=None): # pylint: disable
771771
:return: The data read.
772772
:rtype: bytearray
773773
"""
774-
from websocket import WebSocketTimeoutException
774+
from websocket import WebSocketTimeoutException, WebSocketConnectionClosedException
775775
try:
776776
length = 0
777777
view = buffer or memoryview(bytearray(n))
@@ -794,6 +794,8 @@ def _read(self, n, initial=False, buffer=None, _errnos=None): # pylint: disable
794794
raise IOError("Websocket connection has already been closed.") from None
795795
except WebSocketTimeoutException as wte:
796796
raise TimeoutError('Websocket receive timed out (%s)' % wte) from wte
797+
except (WebSocketConnectionClosedException, SSLError) as e:
798+
raise ConnectionError('Websocket disconnected: %r' % e) from e
797799
except:
798800
self._read_buffer = BytesIO(view[:length])
799801
raise

0 commit comments

Comments
 (0)