From e9269da89753a8be3f87ee0080f578a2106de8ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Mon, 17 Feb 2025 10:57:46 +0100 Subject: [PATCH] Fix using is_shutdown_poll --- .../src/client/real_messages_control/message_handler.rs | 6 +++--- .../client_handling/websocket/connection_handler/mod.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/client-core/src/client/real_messages_control/message_handler.rs b/common/client-core/src/client/real_messages_control/message_handler.rs index 452816e22e..b8417cead9 100644 --- a/common/client-core/src/client/real_messages_control/message_handler.rs +++ b/common/client-core/src/client/real_messages_control/message_handler.rs @@ -618,7 +618,7 @@ where .action_sender .unbounded_send(Action::UpdatePendingAck(id, new_delay)) { - if !self.task_client.is_shutdown() { + if !self.task_client.is_shutdown_poll() { error!("Failed to send update action to the controller: {err}"); } } @@ -629,7 +629,7 @@ where .action_sender .unbounded_send(Action::new_insert(pending_acks)) { - if !self.task_client.is_shutdown() { + if !self.task_client.is_shutdown_poll() { error!("Failed to send insert action to the controller: {err}"); } } @@ -646,7 +646,7 @@ where .send((messages, transmission_lane)) .await { - if !self.task_client.is_shutdown() { + if !self.task_client.is_shutdown_poll() { error!("Failed to forward messages to the real message sender: {err}"); } } diff --git a/gateway/src/node/client_handling/websocket/connection_handler/mod.rs b/gateway/src/node/client_handling/websocket/connection_handler/mod.rs index 478b0ed6eb..f9f6fc584d 100644 --- a/gateway/src/node/client_handling/websocket/connection_handler/mod.rs +++ b/gateway/src/node/client_handling/websocket/connection_handler/mod.rs @@ -95,7 +95,7 @@ where S: AsyncRead + AsyncWrite + Unpin + Send, { // don't accept any new requests if we have already received shutdown - if handle.shutdown.is_shutdown() { + if handle.shutdown.is_shutdown_poll() { debug!("stopping the handle as we have received a shutdown"); return; }