From 6b52132501554d649c492da628b52a0a86a5f2ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Mon, 16 Jan 2023 10:31:01 +0100
Subject: [PATCH] gateway: don't shutdown on connection handler drop (#2848)

---
 .../node/client_handling/websocket/connection_handler/mod.rs   | 3 +++
 1 file changed, 3 insertions(+)

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 2ebfe01ba3..2bab732ae7 100644
--- a/gateway/src/node/client_handling/websocket/connection_handler/mod.rs
+++ b/gateway/src/node/client_handling/websocket/connection_handler/mod.rs
@@ -77,6 +77,9 @@ pub(crate) async fn handle_connection<R, S, St>(
     S: AsyncRead + AsyncWrite + Unpin + Send,
     St: Storage,
 {
+    // If the connection handler abruptly stops, we shouldn't signal global shutdown
+    shutdown.mark_as_success();
+
     match shutdown
         .run_future(handle.perform_websocket_handshake())
         .await