From 258071d857aa8d1524161cb7273f960f24162ce9 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Fri, 16 Sep 2022 09:42:05 -0600 Subject: [PATCH] caddytls: Debug log on implicit tailscale error (#5041) --- modules/caddytls/certmanagers.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/caddytls/certmanagers.go b/modules/caddytls/certmanagers.go index 8c8d7017891..de7abf97364 100644 --- a/modules/caddytls/certmanagers.go +++ b/modules/caddytls/certmanagers.go @@ -66,7 +66,9 @@ func (ts Tailscale) canHazCertificate(ctx context.Context, hello *tls.ClientHell status, err := tscert.GetStatus(ctx) if err != nil { if ts.Optional { - return false, nil // ignore error if we don't expect/require it to work anyway + // ignore error if we don't expect/require it to work anyway, but log it for debugging + ts.logger.Debug("error getting tailscale status", zap.Error(err), zap.String("server_name", hello.ServerName)) + return false, nil } return false, err } @@ -80,8 +82,7 @@ func (ts Tailscale) canHazCertificate(ctx context.Context, hello *tls.ClientHell // UnmarshalCaddyfile deserializes Caddyfile tokens into ts. // -// ... tailscale -// +// ... tailscale func (Tailscale) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { for d.Next() { if d.NextArg() { @@ -178,8 +179,7 @@ func (hcg HTTPCertGetter) GetCertificate(ctx context.Context, hello *tls.ClientH // UnmarshalCaddyfile deserializes Caddyfile tokens into ts. // -// ... http -// +// ... http func (hcg *HTTPCertGetter) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { for d.Next() { if !d.NextArg() {