github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-22 08:57:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd: Emit error if reload cannot find a config to load

Browse Source
This commit is contained in:
Matthew Holt 2020-01-22 10:04:58 -07:00
parent c6bddbfbe2
commit 6614d1c495
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/commandfuncs.go
View File

@ -171,7 +171,7 @@ func cmdRun(fl Flags) (int, error) {
}
// we don't use 'else' here since this value might have been changed in 'if' block; i.e. not mutually exclusive
if !runCmdResumeFlag {
config, err = loadConfig(runCmdConfigFlag, runCmdConfigAdapterFlag)
config, _, err = loadConfig(runCmdConfigFlag, runCmdConfigAdapterFlag)
if err != nil {
return caddy.ExitCodeFailedStartup, err
}
@ -265,10 +265,13 @@ func cmdReload(fl Flags) (int, error) {
reloadCmdAddrFlag := fl.String("address")
// get the config in caddy's native format
config, err := loadConfig(reloadCmdConfigFlag, reloadCmdConfigAdapterFlag)
config, hasConfig, err := loadConfig(reloadCmdConfigFlag, reloadCmdConfigAdapterFlag)
if err != nil {
return caddy.ExitCodeFailedStartup, err
}
if !hasConfig {
return caddy.ExitCodeFailedStartup, fmt.Errorf("no config file to load")
}
// get the address of the admin listener and craft endpoint URL
adminAddr := reloadCmdAddrFlag

22
cmd/main.go
View File

@ -93,12 +93,16 @@ func handlePingbackConn(conn net.Conn, expect []byte) error {
// loadConfig loads the config from configFile and adapts it
// using adapterName. If adapterName is specified, configFile
// must be also. It prints any warnings to stderr, and returns
// the resulting JSON config bytes.
func loadConfig(configFile, adapterName string) ([]byte, error) {
// must be also. If no configFile is specified, it tries
// loading a default config file. The lack of a config file is
// not treated as an error, but false will be returned if
// there is no config available. It prints any warnings to stderr,
// and returns the resulting JSON config bytes along with
// whether a config file was loaded or not.
func loadConfig(configFile, adapterName string) ([]byte, bool, error) {
// specifying an adapter without a config file is ambiguous
if adapterName != "" && configFile == "" {
return nil, fmt.Errorf("cannot adapt config without config file (use --config)")
return nil, false, fmt.Errorf("cannot adapt config without config file (use --config)")
}
// load initial config and adapter
@ -108,7 +112,7 @@ func loadConfig(configFile, adapterName string) ([]byte, error) {
if configFile != "" {
config, err = ioutil.ReadFile(configFile)
if err != nil {
return nil, fmt.Errorf("reading config file: %v", err)
return nil, false, fmt.Errorf("reading config file: %v", err)
}
caddy.Log().Info("using provided configuration",
zap.String("config_file", configFile),
@ -125,7 +129,7 @@ func loadConfig(configFile, adapterName string) ([]byte, error) {
cfgAdapter = nil
} else if err != nil {
// default Caddyfile exists, but error reading it
return nil, fmt.Errorf("reading default Caddyfile: %v", err)
return nil, false, fmt.Errorf("reading default Caddyfile: %v", err)
} else {
// success reading default Caddyfile
configFile = "Caddyfile"
@ -147,7 +151,7 @@ func loadConfig(configFile, adapterName string) ([]byte, error) {
if adapterName != "" {
cfgAdapter = caddyconfig.GetAdapter(adapterName)
if cfgAdapter == nil {
return nil, fmt.Errorf("unrecognized config adapter: %s", adapterName)
return nil, false, fmt.Errorf("unrecognized config adapter: %s", adapterName)
}
}
@ -157,7 +161,7 @@ func loadConfig(configFile, adapterName string) ([]byte, error) {
"filename": configFile,
})
if err != nil {
return nil, fmt.Errorf("adapting config using %s: %v", adapterName, err)
return nil, false, fmt.Errorf("adapting config using %s: %v", adapterName, err)
}
for _, warn := range warnings {
msg := warn.Message
@ -169,7 +173,7 @@ func loadConfig(configFile, adapterName string) ([]byte, error) {
config = adaptedConfig
}
return config, nil
return config, configFile != "", nil
}
// Flags wraps a FlagSet so that typed values