From: qydysky <qydysky@foxmail.com>
Date: Fri, 21 Mar 2025 05:53:53 +0000 (+0000)
Subject: 1
X-Git-Tag: v0.1.20250321055535
X-Git-Url: http://127.0.0.1:8081/?a=commitdiff_plain;h=6c727d947c86ed7e59669ad7d73033b87c9b29c8;p=front%2F.git

1
---

diff --git a/http.go b/http.go
index f106850..29fec9d 100644
--- a/http.go
+++ b/http.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/qydysky/front/utils"
 	component2 "github.com/qydysky/part/component2"
+	pctx "github.com/qydysky/part/ctx"
 	pslice "github.com/qydysky/part/slice"
 )
 
@@ -104,6 +105,11 @@ func (httpDealer) Deal(ctx context.Context, reqId uint32, w http.ResponseWriter,
 		chosenBack.Disable()
 	}
 
+	if pctx.Done(r.Context()) {
+		logger.Warn(`W:`, fmt.Sprintf(logFormat, reqId, r.RemoteAddr, chosenBack.route.config.Addr, routePath, chosenBack.Name, "Err", context.Canceled, time.Since(opT)))
+		return context.Canceled
+	}
+
 	if resp == nil {
 		logger.Warn(`W:`, fmt.Sprintf(logFormat, reqId, r.RemoteAddr, chosenBack.route.config.Addr, routePath, chosenBack.Name, "Err", e, time.Since(opT)))
 		return MarkRetry(ErrResFail)
diff --git a/ws.go b/ws.go
index ecd9071..cf088e7 100644
--- a/ws.go
+++ b/ws.go
@@ -82,14 +82,15 @@ func (wsDealer) Deal(ctx context.Context, reqId uint32, w http.ResponseWriter, r
 	}
 	// }
 
-	if conn == nil || resp == nil {
-		return MarkRetry(ErrResFail)
-	}
-
 	if pctx.Done(r.Context()) {
+		logger.Warn(`W:`, fmt.Sprintf(logFormat, reqId, r.RemoteAddr, chosenBack.route.config.Addr, routePath, chosenBack.Name, context.Canceled, time.Since(opT)))
 		return context.Canceled
 	}
 
+	if conn == nil || resp == nil {
+		return MarkRetry(ErrResFail)
+	}
+
 	if ok, e := chosenBack.getFiliterResHeader().Match(resp.Header); e != nil {
 		logger.Warn(`W:`, fmt.Sprintf(logFormat, reqId, r.RemoteAddr, chosenBack.route.config.Addr, routePath, chosenBack.Name, e, time.Since(opT)))
 	} else if !ok {