From 63e060c50e447dff74793ffc3e8ac0d8279cc121 Mon Sep 17 00:00:00 2001
From: Peter Sanchez <peter@netlandish.com>
Date: Thu, 6 Jun 2024 15:09:20 -0600
Subject: [PATCH] Adding new check for echo context.Canceled relay errors

---
 server/server.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/server.go b/server/server.go
index af9390b..9fa5844 100644
--- a/server/server.go
+++ b/server/server.go
@@ -165,7 +165,8 @@ func (c *Context) Error(err error) {
 func (s *Server) HTTPErrorHandler(err error, c echo.Context) {
 	// TODO: Send to Sentry or some other logger
 
-	if errors.Is(err, context.Canceled) {
+	// First check is for echo error relay
+	if err.Error() == "context canceled" || errors.Is(err, context.Canceled) {
 		s.e.DefaultHTTPErrorHandler(err, c)
 	}
 
@@ -272,7 +273,7 @@ func (s *Server) gqlEmailRecover(ctx context.Context, _origErr any) error {
 		return fmt.Errorf("internal system error")
 	}
 
-	if errors.Is(origErr, context.Canceled) {
+	if origErr.Error() == "context canceled" || errors.Is(origErr, context.Canceled) {
 		return origErr
 	}
 
-- 
2.45.2