Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 14, 05:15 UTC
cmd: Use loadConfig() for validate as run, start, and reload do
Matthew Holt committed
Mar 9, 2020 at 00:09 UTC
99d34f1c1d6a785104252303c9c7744373052342
1 file changed
+2
-27
cmd/commandfuncs.go
+2
-27
@@ -492,35 +492,10 @@ func cmdValidateConfig(fl Flags) (int, error) {
492
validateCmdConfigFlag := fl.String("config")
493
validateCmdAdapterFlag := fl.String("adapter")
494
495
- input, err := ioutil.ReadFile(validateCmdConfigFlag)
495
+ input, _, err := loadConfig(validateCmdConfigFlag, validateCmdAdapterFlag)
496
if err != nil {
497
- return caddy.ExitCodeFailedStartup,
498
- fmt.Errorf("reading input file: %v", err)
499
- }
500
-
501
- if validateCmdAdapterFlag != "" {
502
- cfgAdapter := caddyconfig.GetAdapter(validateCmdAdapterFlag)
503
- if cfgAdapter == nil {
504
- return caddy.ExitCodeFailedStartup,
505
- fmt.Errorf("unrecognized config adapter: %s", validateCmdAdapterFlag)
506
- }
507
-
508
- adaptedConfig, warnings, err := cfgAdapter.Adapt(input, nil)
509
- if err != nil {
510
- return caddy.ExitCodeFailedStartup, err
511
- }
512
- // print warnings to stderr
513
- for _, warn := range warnings {
514
- msg := warn.Message
515
- if warn.Directive != "" {
516
- msg = fmt.Sprintf("%s: %s", warn.Directive, warn.Message)
517
- }
518
- fmt.Fprintf(os.Stderr, "[WARNING][%s] %s:%d: %s\n", validateCmdAdapterFlag, warn.File, warn.Line, msg)
519
- }
520
-
521
- input = adaptedConfig
497
+ return caddy.ExitCodeFailedStartup, err
498
}
523
-
499
input = caddy.RemoveMetaFields(input)
500
501
var cfg *caddy.Config