From: qydysky Date: Tue, 8 Oct 2024 07:46:08 +0000 (+0000) Subject: 1 X-Git-Tag: v0.1.20241008074820 X-Git-Url: http://127.0.0.1:8081/?a=commitdiff_plain;h=c1d3408fa862b5f7e4ebd42f94f5a07c8c040999;p=front%2F.git 1 --- diff --git a/config.go b/config.go index 0640598..0e171bd 100755 --- 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 d79b65e..d3df2a7 100644 --- 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 273cb78..de447dd 100644 --- 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 }