Skip to content

cmd: Pass configFile, not configFlag, for reload command #7532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mholt merged 2 commits into from
Feb 27, 2026
Merged

cmd: Pass configFile, not configFlag, for reload command #7532

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1badcc8
cmd: Pass configFile, not configFlag, for reload command
mholt Feb 27, 2026
755e485
Remove debug log line
francislavoie Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/commandfuncs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ func cmdReload(fl Flags) (int, error) {
return caddy.ExitCodeFailedStartup, fmt.Errorf("no config file to load")
}

adminAddr, err := DetermineAdminAPIAddress(addressFlag, config, configFlag, configAdapterFlag)
adminAddr, err := DetermineAdminAPIAddress(addressFlag, config, configFile, configAdapterFlag)
Copy link
Member

@francislavoie francislavoie Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🫠 well that's an embarassing mistake

Copy link
Member Author

@mholt mholt Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've done worse. Way worse 🤣

if err != nil {
return caddy.ExitCodeFailedStartup, fmt.Errorf("couldn't determine admin API address: %v", err)
}
Expand Down Expand Up @@ -757,6 +757,7 @@ func handleEnvFileFlag(fl Flags) error {
// need to interact with a running instance of Caddy via the admin API.
func AdminAPIRequest(adminAddr, method, uri string, headers http.Header, body io.Reader) (*http.Response, error) {
parsedAddr, err := caddy.ParseNetworkAddress(adminAddr)
log.Println("ADMIN ADDR:", adminAddr, parsedAddr)
if err != nil || parsedAddr.PortRangeSize() > 1 {
return nil, fmt.Errorf("invalid admin address %s: %v", adminAddr, err)
}
Expand Down
Loading