]> 127.0.0.1 Git - front/.git/commitdiff
1 v0.1.20241008074820
authorqydysky <qydysky@foxmail.com>
Tue, 8 Oct 2024 07:46:08 +0000 (07:46 +0000)
committerGitHub <noreply@github.com>
Tue, 8 Oct 2024 07:46:08 +0000 (07:46 +0000)
config.go
http.go
ws.go

index 064059861fec3bb4fffdf7ccbfa952ee4b453c56..0e171bd977731a5cfd00f82d0594964ad6d56894 100755 (executable)
--- a/config.go
+++ b/config.go
@@ -168,7 +168,7 @@ func (t *Config) SwapSign(ctx context.Context, logger Logger) {
                                        Deal(ctx context.Context, w http.ResponseWriter, r *http.Request, routePath string, chosenBack *Back, logger Logger, blocksi pslice.BlocksI[byte]) error
                                }
 
-                               for i := 0; i < len(backIs); i++ {
+                               for i := 0; i < len(backIs) && errors.Is(e, ErrAllBacksFail); i++ {
                                        if !backIs[i].IsLive() {
                                                continue
                                        }
@@ -180,18 +180,12 @@ func (t *Config) SwapSign(ctx context.Context, logger Logger) {
                                        } else {
                                                e = component2.Get[reqDealer]("http").Deal(r.Context(), w, r, routePath, backIs[i], logger, t.BlocksI)
                                        }
-
-                                       if e == nil || errors.Is(e, ErrReqCreFail) {
-                                               break
-                                       }
                                }
 
                                if e != nil {
                                        w.Header().Add(header+"Error", e.Error())
                                        if errors.Is(e, ErrHeaderCheckFail) || errors.Is(e, ErrBodyCheckFail) {
                                                w.WriteHeader(http.StatusForbidden)
-                                       } else if errors.Is(e, ErrReqCreFail) {
-                                               w.WriteHeader(http.StatusServiceUnavailable)
                                        } else if errors.Is(e, ErrAllBacksFail) {
                                                w.WriteHeader(http.StatusBadGateway)
                                        } else {
diff --git a/http.go b/http.go
index d79b65e79f32cfc27e420639cfdef672fbd367a0..d3df2a7d3c7abc1ecd0615083a5e49c6bf0a7fb7 100644 (file)
--- a/http.go
+++ b/http.go
@@ -103,10 +103,6 @@ func (httpDealer) Deal(ctx context.Context, w http.ResponseWriter, r *http.Reque
                resp = nil
        }
 
-       if chosenBack == nil {
-               return ErrAllBacksFail
-       }
-
        if resp == nil {
                return ErrResFail
        }
diff --git a/ws.go b/ws.go
index 273cb7824f4d8d2e86add9cdcda532adfc41b8ee..de447dd0b1ef54f6f7bedee3652356355eb318e8 100644 (file)
--- a/ws.go
+++ b/ws.go
@@ -84,10 +84,6 @@ func (wsDealer) Deal(ctx context.Context, w http.ResponseWriter, r *http.Request
        }
        // }
 
-       if chosenBack == nil {
-               return ErrAllBacksFail
-       }
-
        if resp == nil || conn == nil {
                return ErrResFail
        }