diff options
| author | Matt Holt <[email protected]> | 2024-10-01 20:31:30 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-10-01 20:31:30 -0600 |
| commit | c8adb1b553412253d5f166065635ab809d3eef33 (patch) | |
| tree | c9481e569f09a09cf7383bb4e2c6c9441a573b9e /modules | |
| parent | 9b4acc2449b10ff7c32eff4ddf1838cd2d93c9cf (diff) | |
| download | caddy-c8adb1b553412253d5f166065635ab809d3eef33.tar.gz caddy-c8adb1b553412253d5f166065635ab809d3eef33.zip | |
cmd: Better error handling when reloading (#6601)
* caddyhttp: Limit auto-HTTPS error logs to 100 domains
* Improve error message and increase error size limit
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/caddyhttp/autohttps.go | 2 | ||||
| -rw-r--r-- | modules/caddytls/tls.go | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/modules/caddyhttp/autohttps.go b/modules/caddyhttp/autohttps.go index ea5a07b3c..79fdfd6ec 100644 --- a/modules/caddyhttp/autohttps.go +++ b/modules/caddyhttp/autohttps.go @@ -732,7 +732,7 @@ func (app *App) automaticHTTPSPhase2() error { ) err := app.tlsApp.Manage(app.allCertDomains) if err != nil { - return fmt.Errorf("managing certificates for %v: %s", app.allCertDomains, err) + return fmt.Errorf("managing certificates for %d domains: %s", len(app.allCertDomains), err) } app.allCertDomains = nil // no longer needed; allow GC to deallocate return nil diff --git a/modules/caddytls/tls.go b/modules/caddytls/tls.go index 5f3d0eaeb..f04beb2ee 100644 --- a/modules/caddytls/tls.go +++ b/modules/caddytls/tls.go @@ -447,6 +447,10 @@ func (t *TLS) Manage(names []string) error { for ap, names := range policyToNames { err := ap.magic.ManageAsync(t.ctx.Context, names) if err != nil { + const maxNamesToDisplay = 100 + if len(names) > maxNamesToDisplay { + names = append(names[:maxNamesToDisplay], fmt.Sprintf("(%d more...)", len(names)-maxNamesToDisplay)) + } return fmt.Errorf("automate: manage %v: %v", names, err) } for _, name := range names { |