From 76a44d23f16a8edf4ee7a4614e77cd43d50e6122 Mon Sep 17 00:00:00 2001 From: Daniele Palaia Date: Thu, 19 Oct 2023 11:11:47 +0200 Subject: [PATCH] replacing exception report to string --- .../consumer_handle_connections_issues.py | 2 +- ...mer_handle_connections_issues_with_close.py | 2 +- ...cer_handle_connections_issues_with_close.py | 2 +- ...tream_consumer_handle_connections_issues.py | 18 +++++++++--------- ...tream_producer_handle_connections_issues.py | 2 +- rstream/client.py | 14 +++++++------- rstream/utils.py | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/examples/check_connection_broken/consumer_handle_connections_issues.py b/docs/examples/check_connection_broken/consumer_handle_connections_issues.py index 91960f2..66a27e5 100644 --- a/docs/examples/check_connection_broken/consumer_handle_connections_issues.py +++ b/docs/examples/check_connection_broken/consumer_handle_connections_issues.py @@ -17,7 +17,7 @@ async def on_connection_closed(disconnection_info: DisconnectionErrorInfo) -> No "connection has been closed from stream: " + str(disconnection_info.streams) + " for reason: " - + str(disconnection_info.reason) + + disconnection_info.reason ) diff --git a/docs/examples/check_connection_broken/consumer_handle_connections_issues_with_close.py b/docs/examples/check_connection_broken/consumer_handle_connections_issues_with_close.py index d8d017b..7718da3 100644 --- a/docs/examples/check_connection_broken/consumer_handle_connections_issues_with_close.py +++ b/docs/examples/check_connection_broken/consumer_handle_connections_issues_with_close.py @@ -18,7 +18,7 @@ async def on_connection_closed(disconnection_info: DisconnectionErrorInfo) -> No "connection has been closed from stream: " + str(disconnection_info.streams) + " for reason: " - + str(disconnection_info.reason) + + disconnection_info.reason ) global connection_is_closed diff --git a/docs/examples/check_connection_broken/producer_handle_connections_issues_with_close.py b/docs/examples/check_connection_broken/producer_handle_connections_issues_with_close.py index 0f89e16..828a998 100644 --- a/docs/examples/check_connection_broken/producer_handle_connections_issues_with_close.py +++ b/docs/examples/check_connection_broken/producer_handle_connections_issues_with_close.py @@ -18,7 +18,7 @@ async def on_connection_closed(disconnection_info: DisconnectionErrorInfo) -> No "connection has been closed from stream: " + str(disconnection_info.streams) + " for reason: " - + str(disconnection_info.reason) + + disconnection_info.reason ) # clean close or reconnect diff --git a/docs/examples/check_connection_broken/superstream_consumer_handle_connections_issues.py b/docs/examples/check_connection_broken/superstream_consumer_handle_connections_issues.py index ac20657..6fab178 100644 --- a/docs/examples/check_connection_broken/superstream_consumer_handle_connections_issues.py +++ b/docs/examples/check_connection_broken/superstream_consumer_handle_connections_issues.py @@ -23,16 +23,16 @@ async def on_message(msg: AMQPMessage, message_context: MessageContext): print("Received message: {} from stream: {} - message offset: {}".format(msg, stream, offset)) -async def on_connection_closed(disconnection_info: DisconnectionErrorInfo) -> None: - print( - "connection has been closed from stream: " - + str(disconnection_info.streams) - + " for reason: " - + str(disconnection_info.reason) - ) - - async def consume(): + async def on_connection_closed(disconnection_info: DisconnectionErrorInfo) -> None: + print( + "connection has been closed from stream: " + + str(disconnection_info.streams) + + " for reason: " + + disconnection_info.reason + ) + await consumer.close() + consumer = SuperStreamConsumer( host="localhost", port=5552, diff --git a/docs/examples/check_connection_broken/superstream_producer_handle_connections_issues.py b/docs/examples/check_connection_broken/superstream_producer_handle_connections_issues.py index 5b922b0..4b39a09 100644 --- a/docs/examples/check_connection_broken/superstream_producer_handle_connections_issues.py +++ b/docs/examples/check_connection_broken/superstream_producer_handle_connections_issues.py @@ -25,7 +25,7 @@ async def on_connection_closed(disconnection_info: DisconnectionErrorInfo) -> No "connection has been closed from stream: " + str(disconnection_info.streams) + " for reason: " - + str(disconnection_info.reason) + + disconnection_info.reason ) global connection_is_closed connection_is_closed = True diff --git a/rstream/client.py b/rstream/client.py index ba4b252..dd9000f 100644 --- a/rstream/client.py +++ b/rstream/client.py @@ -145,12 +145,12 @@ async def send_frame(self, frame: schema.Frame) -> None: assert self._conn try: await self._conn.write_frame(frame) - except socket.error as e: + except socket.error: self._is_not_closed = False if self._connection_closed_handler is None: logger.exception("TCP connection closed") else: - connection_error_info = DisconnectionErrorInfo(e, self._streams) + connection_error_info = DisconnectionErrorInfo("Socket Error", self._streams) result = self._connection_closed_handler(connection_error_info) if result is not None and inspect.isawaitable(result): await result @@ -215,10 +215,10 @@ async def _listener(self) -> None: try: if self.is_connection_alive(): frame = await self._conn.read_frame() - except ConnectionClosed as e: + except ConnectionClosed: if self._connection_closed_handler is not None and self.is_connection_alive(): - connection_error_info = DisconnectionErrorInfo(e, self._streams) + connection_error_info = DisconnectionErrorInfo("Connection Closed", self._streams) result = self._connection_closed_handler(connection_error_info) if result is not None and inspect.isawaitable(result): await result @@ -227,15 +227,15 @@ async def _listener(self) -> None: self._is_not_closed = False break - except socket.error as e: + except socket.error: if self._conn is not None: if self._connection_closed_handler is not None and self.is_connection_alive(): - connection_error_info = DisconnectionErrorInfo(e, self._streams) + connection_error_info = DisconnectionErrorInfo("Socket Error", self._streams) result = self._connection_closed_handler(connection_error_info) if result is not None and inspect.isawaitable(result): await result else: - print("TCP connection closed") + logger.debug("TCP connection closed") self._is_not_closed = False break diff --git a/rstream/utils.py b/rstream/utils.py index 7c9a8cc..395b045 100644 --- a/rstream/utils.py +++ b/rstream/utils.py @@ -43,5 +43,5 @@ def __await__(self) -> Generator[Any, None, Any]: @dataclass class DisconnectionErrorInfo: - reason: Exception + reason: str streams: list[str]