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

TUN-4419: Improve error message when cloudflared cannot reach origin

This commit is contained in:
Adam Chalmers 2021-05-14 23:49:34 -05:00
parent a2bbe1bdc2
commit a3153c6add
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
origin/proxy.go
View File

@ -18,9 +18,10 @@ import (
) )
const ( const (
TagHeaderNamePrefix = "Cf-Warp-Tag-" TagHeaderNamePrefix = "Cf-Warp-Tag-"
LogFieldCFRay = "cfRay" LogFieldCFRay = "cfRay"
LogFieldRule = "ingressRule" LogFieldRule = "ingressRule"
LogFieldOriginService = "originService"
) )
type proxy struct { type proxy struct {
@ -70,7 +71,7 @@ func (p *proxy) Proxy(w connection.ResponseWriter, req *http.Request, sourceConn
rule: ingress.ServiceWarpRouting, rule: ingress.ServiceWarpRouting,
} }
if err := p.proxyStreamRequest(serveCtx, w, req, p.warpRouting.Proxy, logFields); err != nil { if err := p.proxyStreamRequest(serveCtx, w, req, p.warpRouting.Proxy, logFields); err != nil {
p.logRequestError(err, cfRay, ingress.ServiceWarpRouting) p.logRequestError(err, cfRay, "", ingress.ServiceWarpRouting)
return err return err
} }
return nil return nil
@ -86,7 +87,8 @@ func (p *proxy) Proxy(w connection.ResponseWriter, req *http.Request, sourceConn
if sourceConnectionType == connection.TypeHTTP { if sourceConnectionType == connection.TypeHTTP {
if err := p.proxyHTTPRequest(w, req, rule, logFields); err != nil { if err := p.proxyHTTPRequest(w, req, rule, logFields); err != nil {
p.logRequestError(err, cfRay, ruleField(p.ingressRules, ruleNum)) rule, srv := ruleField(p.ingressRules, ruleNum)
p.logRequestError(err, cfRay, rule, srv)
return err return err
} }
return nil return nil
@ -99,17 +101,19 @@ func (p *proxy) Proxy(w connection.ResponseWriter, req *http.Request, sourceConn
} }
if err := p.proxyStreamRequest(serveCtx, w, req, connectionProxy, logFields); err != nil { if err := p.proxyStreamRequest(serveCtx, w, req, connectionProxy, logFields); err != nil {
p.logRequestError(err, cfRay, ruleField(p.ingressRules, ruleNum)) rule, srv := ruleField(p.ingressRules, ruleNum)
p.logRequestError(err, cfRay, rule, srv)
return err return err
} }
return nil return nil
} }
func ruleField(ing ingress.Ingress, ruleNum int) string { func ruleField(ing ingress.Ingress, ruleNum int) (ruleID string, srv string) {
srv = ing.Rules[ruleNum].Service.String()
if ing.IsSingleRule() { if ing.IsSingleRule() {
return "" return "", srv
} }
return fmt.Sprintf("%d", ruleNum) return fmt.Sprintf("%d", ruleNum), srv
} }
func (p *proxy) proxyHTTPRequest(w connection.ResponseWriter, req *http.Request, rule *ingress.Rule, fields logFields) error { func (p *proxy) proxyHTTPRequest(w connection.ResponseWriter, req *http.Request, rule *ingress.Rule, fields logFields) error {
@ -133,7 +137,7 @@ func (p *proxy) proxyHTTPRequest(w connection.ResponseWriter, req *http.Request,
resp, err := httpService.RoundTrip(req) resp, err := httpService.RoundTrip(req)
if err != nil { if err != nil {
return errors.Wrap(err, "Error proxying request to origin") 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")
} }
defer resp.Body.Close() defer resp.Body.Close()
@ -271,7 +275,7 @@ func (p *proxy) logOriginResponse(resp *http.Response, fields logFields) {
} }
} }
func (p *proxy) logRequestError(err error, cfRay string, rule string) { func (p *proxy) logRequestError(err error, cfRay string, rule, service string) {
requestErrors.Inc() requestErrors.Inc()
log := p.log.Error().Err(err) log := p.log.Error().Err(err)
if cfRay != "" { if cfRay != "" {
@ -280,6 +284,9 @@ func (p *proxy) logRequestError(err error, cfRay string, rule string) {
if rule != "" { if rule != "" {
log = log.Str(LogFieldRule, rule) log = log.Str(LogFieldRule, rule)
} }
if service != "" {
log = log.Str(LogFieldOriginService, service)
}
log.Msg("") log.Msg("")
} }