Skip to content

Apply timeout flags after merge so explicit zero disables the timeout #51

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

Open
Robbie1977 wants to merge 1 commit into
base: v2
Choose a base branch
from
Open

Apply timeout flags after merge so explicit zero disables the timeout #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,21 @@ func (a *app) ParseConfig(args []string) (*simpleuploadserver.ServerConfig, erro
}
log.Printf("merged flag config: %+v", config)

// mergo.WithOverride does not override a destination field with a zero-value
// source field. An explicit `-read_timeout 0` parses to the zero value, which
// is indistinguishable from an unset flag, so it never overrides the non-zero
// default ReadTimeout and the documented "zero ... means no timeout" cannot be
// selected. Apply the timeout flags directly when the user actually provided
// them so that an explicit 0 disables the timeout as documented.
a.flagSet.Visit(func(f *flag.Flag) {
switch f.Name {
case "read_timeout":
config.ReadTimeout = Duration(a.readTimeout)
case "write_timeout":
config.WriteTimeout = Duration(a.writeTimeout)
}
})

v := config.AsConfig()
return &v, nil
}