From 85d6a67fbc4d490da90e58f3fe97253967401ca1 Mon Sep 17 00:00:00 2001
From: jangko <jangko128@gmail.com>
Date: Mon, 29 Jan 2024 10:40:40 +0700
Subject: [PATCH] Move CancelledError handling to outer try/except of
 RpcWebsocketServer

---
 json_rpc/servers/websocketserver.nim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/json_rpc/servers/websocketserver.nim b/json_rpc/servers/websocketserver.nim
index 7005cc9..8bb9a20 100644
--- a/json_rpc/servers/websocketserver.nim
+++ b/json_rpc/servers/websocketserver.nim
@@ -64,8 +64,6 @@ proc serveHTTP*(rpc: RpcWebSocketHandler, request: HttpRequest)
 
       let data = try:
           await rpc.route(string.fromBytes(recvData))
-        except CancelledError as exc:
-          raise exc
         except CatchableError as exc:
           debug "Internal error, while processing RPC call",
             address = $request.uri
@@ -80,6 +78,9 @@ proc serveHTTP*(rpc: RpcWebSocketHandler, request: HttpRequest)
   except WebSocketError as exc:
     error "WebSocket error:", exception = exc.msg
 
+  except CancelledError as exc:
+    raise exc
+
   except CatchableError as exc:
     error "Something error", msg=exc.msg