curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 0df4bb32d5 into cb97257815

This commit is contained in:
Mads Jon Nielsen 2023-05-20 11:25:07 -07:00 committed by GitHub
parent cb97257815 0df4bb32d5
commit 9df95dedf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
proxy/proxy.go
View File

@ -36,6 +36,10 @@ const (
trailerHeaderName = "Trailer"
)
var (
ErrRequestEndedAbruptly = errors.New("Incoming request ended abruptly")
)
// Proxy represents a means to Proxy between cloudflared and the origin services.
type Proxy struct {
ingressRules ingress.Ingress
@ -127,7 +131,11 @@ func (p *Proxy) ProxyHTTP(
logFields,
); err != nil {
rule, srv := ruleField(p.ingressRules, ruleNum)
p.logRequestError(err, cfRay, "", rule, srv)
if errors.Is(err, ErrRequestEndedAbruptly) {
p.log.Debug().Msg(err.Error())
} else {
p.logRequestError(err, cfRay, "", rule, srv)
}
return err
}
return nil
@ -242,7 +250,7 @@ func (p *Proxy) proxyHTTPRequest(
if err != nil {
tracing.EndWithErrorStatus(ttfbSpan, err)
if err := roundTripReq.Context().Err(); err != nil {
return errors.Wrap(err, "Incoming request ended abruptly")
return ErrRequestEndedAbruptly
}
return errors.Wrap(err, "Unable to reach the origin service. The service may be down or it may not be responding to traffic from cloudflared")
}