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

cmd: Make --config flag optional for reload command

Browse Source 
In case it is using the default Caddyfile
This commit is contained in:
Matthew Holt 2020-01-22 09:33:22 -07:00
parent d810637a9f
commit 9a1370c2c8
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/commandfuncs.go
View File

@ -264,12 +264,6 @@ func cmdReload(fl Flags) (int, error) {
reloadCmdConfigAdapterFlag := fl.String("adapter") reloadCmdConfigAdapterFlag := fl.String("adapter")
reloadCmdAddrFlag := fl.String("address") reloadCmdAddrFlag := fl.String("address")
// a configuration is required
if reloadCmdConfigFlag == "" {
return caddy.ExitCodeFailedStartup,
fmt.Errorf("no configuration to load (use --config)")
}
// get the config in caddy's native format // get the config in caddy's native format
config, err := loadConfig(reloadCmdConfigFlag, reloadCmdConfigAdapterFlag) config, err := loadConfig(reloadCmdConfigFlag, reloadCmdConfigAdapterFlag)
if err != nil { if err != nil {
@ -278,7 +272,7 @@ func cmdReload(fl Flags) (int, error) {
// get the address of the admin listener and craft endpoint URL // get the address of the admin listener and craft endpoint URL
adminAddr := reloadCmdAddrFlag adminAddr := reloadCmdAddrFlag
if adminAddr == "" { if adminAddr == "" && len(config) > 0 {
var tmpStruct struct { var tmpStruct struct {
Admin caddy.AdminConfig `json:"admin"` Admin caddy.AdminConfig `json:"admin"`
} }

2
cmd/main.go
View File

@ -97,7 +97,7 @@ func handlePingbackConn(conn net.Conn, expect []byte) error {
// the resulting JSON config bytes. // the resulting JSON config bytes.
func loadConfig(configFile, adapterName string) ([]byte, error) { func loadConfig(configFile, adapterName string) ([]byte, error) {
// specifying an adapter without a config file is ambiguous // specifying an adapter without a config file is ambiguous
if configFile == "" && adapterName != "" { if adapterName != "" && configFile == "" {
return nil, fmt.Errorf("cannot adapt config without config file (use --config)") return nil, fmt.Errorf("cannot adapt config without config file (use --config)")
} }