From 4ee2e57ec8474cf7c9a4f018de97926d8899f7cb Mon Sep 17 00:00:00 2001
From: Ashley Sommer <ashleysommer@gmail.com>
Date: Tue, 24 May 2022 05:47:05 +1000
Subject: [PATCH] Properly catch websocket CancelledError in websocket handler
 in Python 3.7 (#2463)

---
 sanic/app.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sanic/app.py b/sanic/app.py
index b79d16e4eb..70d7b0b51e 100644
--- a/sanic/app.py
+++ b/sanic/app.py
@@ -992,10 +992,10 @@ async def _websocket_handler(
         cancelled = False
         try:
             await fut
-        except Exception as e:
-            self.error_handler.log(request, e)
         except (CancelledError, ConnectionClosed):
             cancelled = True
+        except Exception as e:
+            self.error_handler.log(request, e)
         finally:
             self.websocket_tasks.remove(fut)
             if cancelled: