diff --git a/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/_connection.py b/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/_connection.py index 0e57cbe55752..b05025227e8f 100644 --- a/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/_connection.py +++ b/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/_connection.py @@ -337,13 +337,13 @@ def _get_next_outgoing_channel(self) -> int: def _outgoing_empty(self) -> None: """Send an empty frame to prevent the connection from reaching an idle timeout.""" - if self._network_trace: - _LOGGER.debug("-> EmptyFrame()", extra=self._network_trace_params) if self._error: raise self._error try: if self._can_write(): + if self._network_trace: + _LOGGER.debug("-> EmptyFrame()", extra=self._network_trace_params) self._transport.write(EMPTY_FRAME) self._last_frame_sent_time = time.time() except (OSError, IOError, SSLError, socket.error) as exc: diff --git a/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/aio/_client_async.py b/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/aio/_client_async.py index ef194c45db7d..bab8d32488cb 100644 --- a/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/aio/_client_async.py +++ b/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/aio/_client_async.py @@ -150,11 +150,6 @@ async def _keep_alive_async(self): current_time = time.time() elapsed_time = current_time - start_time if elapsed_time >= self._keep_alive_interval: - _logger.debug( - "Keeping %r connection alive.", - self.__class__.__name__, - extra=self._network_trace_params - ) await asyncio.shield(self._connection.listen(wait=self._socket_timeout, batch=self._link.current_link_credit)) start_time = current_time diff --git a/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/aio/_connection_async.py b/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/aio/_connection_async.py index ceb32b96e11f..82a114ad63cd 100644 --- a/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/aio/_connection_async.py +++ b/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/aio/_connection_async.py @@ -345,14 +345,13 @@ def _get_next_outgoing_channel(self) -> int: async def _outgoing_empty(self) -> None: """Send an empty frame to prevent the connection from reaching an idle timeout.""" - if self._network_trace: - _LOGGER.debug("-> EmptyFrame()", extra=self._network_trace_params) - if self._error: raise self._error try: if self._can_write(): + if self._network_trace: + _LOGGER.debug("-> EmptyFrame()", extra=self._network_trace_params) await self._transport.write(EMPTY_FRAME) self._last_frame_sent_time = time.time() except (OSError, IOError, SSLError, socket.error) as exc: diff --git a/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/client.py b/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/client.py index 05e61968c6b9..4ba0481f40b0 100644 --- a/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/client.py +++ b/sdk/servicebus/azure-servicebus/azure/servicebus/_pyamqp/client.py @@ -236,7 +236,6 @@ def _keep_alive(self): current_time = time.time() elapsed_time = current_time - start_time if elapsed_time >= self._keep_alive_interval: - _logger.debug("Keeping %r connection alive.", self.__class__.__name__) self._connection.listen(wait=self._socket_timeout, batch=self._link.current_link_credit) start_time = current_time time.sleep(1)