diff --git a/internal/nodes/http_request_cache.go b/internal/nodes/http_request_cache.go index 08a89bb..e616a15 100644 --- a/internal/nodes/http_request_cache.go +++ b/internal/nodes/http_request_cache.go @@ -6,6 +6,7 @@ import ( "github.com/TeaOSLab/EdgeNode/internal/caches" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" "github.com/iwind/TeaGo/logs" + "golang.org/x/net/http2" "net/http" "strconv" ) @@ -89,7 +90,9 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) { return } - remotelogs.Error("REQUEST_CACHE", "read from cache failed: "+err.Error()) + if _, ok := err.(http2.StreamError); !ok { + remotelogs.Error("REQUEST_CACHE", "read from cache failed: "+err.Error()) + } return } defer func() { @@ -121,7 +124,9 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) { return true, nil }) if err != nil { - remotelogs.Error("REQUEST_CACHE", "read from cache failed: "+err.Error()) + if _, ok := err.(http2.StreamError); !ok { + remotelogs.Error("REQUEST_CACHE", "read from cache failed: "+err.Error()) + } return } @@ -211,7 +216,9 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) { this.writer.WriteHeader(http.StatusRequestedRangeNotSatisfiable) return true } - remotelogs.Error("REQUEST_CACHE", "read from cache failed: "+err.Error()) + if _, ok := err.(http2.StreamError); !ok { + remotelogs.Error("REQUEST_CACHE", "read from cache failed: "+err.Error()) + } return } } else if len(rangeSet) > 1 { @@ -252,7 +259,9 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) { return true, err }) if err != nil { - remotelogs.Error("REQUEST_CACHE", "read from cache failed: "+err.Error()) + if _, ok := err.(http2.StreamError); !ok { + remotelogs.Error("REQUEST_CACHE", "read from cache failed: "+err.Error()) + } return true } } @@ -273,7 +282,9 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) { return true, nil }) if err != nil { - remotelogs.Error("REQUEST_CACHE", "read from cache failed: "+err.Error()) + if _, ok := err.(http2.StreamError); !ok { + remotelogs.Error("REQUEST_CACHE", "read from cache failed: "+err.Error()) + } return } } diff --git a/internal/nodes/http_request_reverse_proxy.go b/internal/nodes/http_request_reverse_proxy.go index 5fce959..e6658da 100644 --- a/internal/nodes/http_request_reverse_proxy.go +++ b/internal/nodes/http_request_reverse_proxy.go @@ -7,6 +7,7 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" "github.com/TeaOSLab/EdgeNode/internal/utils" + "golang.org/x/net/http2" "io" "net/url" "strconv" @@ -256,11 +257,15 @@ func (this *HTTPRequest) doReverseProxy() { err1 := resp.Body.Close() if err1 != nil { - remotelogs.Error("REQUEST_REVERSE_PROXY", err1.Error()) + if _, ok := err1.(http2.StreamError); !ok { + remotelogs.Error("REQUEST_REVERSE_PROXY", err1.Error()) + } } if err != nil && err != io.EOF { - remotelogs.Error("REQUEST_REVERSE_PROXY", err.Error()) - this.addError(err) + if _, ok := err.(http2.StreamError); !ok { + remotelogs.Error("REQUEST_REVERSE_PROXY", err.Error()) + this.addError(err) + } } }