Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 13, 05:30 UTC
cmd: make `caddy fmt` hints more clear (#5378)
Emily Lange committed
Feb 17, 2023 at 00:34 UTC
bf54892a73373637901c13e018b20cfac15878b4
2 files changed
+5
-2
caddyconfig/caddyfile/adapter.go
+1
-1
@@ -88,7 +88,7 @@ func FormattingDifference(filename string, body []byte) (caddyconfig.Warning, bo
88
return caddyconfig.Warning{
89
File: filename,
90
Line: line,
91
- Message: "Caddyfile input is not formatted; run the 'caddy fmt' command to fix inconsistencies",
91
+ Message: "Caddyfile input is not formatted; run 'caddy fmt --overwrite' to fix inconsistencies",
92
}, true
93
}
94
cmd/commandfuncs.go
+4
-1
@@ -589,7 +589,10 @@ func cmdFmt(fl Flags) (int, error) {
589
}
590
591
if warning, diff := caddyfile.FormattingDifference(formatCmdConfigFile, input); diff {
592
- return caddy.ExitCodeFailedStartup, fmt.Errorf("%s:%d: Caddyfile input is not formatted", warning.File, warning.Line)
592
+ return caddy.ExitCodeFailedStartup, fmt.Errorf(`%s:%d: Caddyfile input is not formatted; Tip: use '--overwrite' to update your Caddyfile in-place instead of previewing it. Consult '--help' for more options`,
593
+ warning.File,
594
+ warning.Line,
595
+ )
596
}
597
598
return caddy.ExitCodeSuccess, nil