Skip to content
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

config: multiple web.listen-address args results into an error, if --config.file is defined. #1876

Merged
merged 7 commits into from
Feb 12, 2025
Merged

config: multiple web.listen-address args results into an error, if --config.file is defined. #1876

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
193b4e9
config: multiple web.listen-address args results into an error, if --…
jkroepke Feb 9, 2025
d87fb65
config: multiple web.listen-address args results into an error, if --…
jkroepke Feb 9, 2025
4a3cf34
Merge branch 'master' into config-file-ports
jkroepke Feb 9, 2025
fa22837
add debug logging
jkroepke Feb 10, 2025
a01fa0e
Merge branch 'master' into config-file-ports
jkroepke Feb 11, 2025
8da4b6e
config: multiple web.listen-address args results into an error, if --…
jkroepke Feb 11, 2025
7ffe860
config: multiple web.listen-address args results into an error, if --…
jkroepke Feb 11, 2025
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
11 changes: 6 additions & 5 deletions cmd/windows_exporter/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,6 @@ func run() int {
return 1
}

// NOTE: This is temporary fix for issue #1092, calling kingpin.Parse
// twice makes slices flags duplicate its value, this clean up
// the first parse before the second call.
*webConfig.WebListenAddresses = (*webConfig.WebListenAddresses)[1:]

// Parse flags once more to include those discovered in configuration file(s).
if _, err = app.Parse(os.Args[1:]); err != nil {
logger.ErrorContext(ctx, "failed to parse CLI args from YAML file",
Expand All @@ -177,6 +172,12 @@ func run() int {
return 1
}

// NOTE: This is temporary fix for issue #1092, calling kingpin.Parse
// twice makes slices flags duplicate its value, this clean up
// the first parse before the second call.
slices.Sort(*webConfig.WebListenAddresses)
*webConfig.WebListenAddresses = slices.Clip(slices.Compact(*webConfig.WebListenAddresses))

logger, err = log.New(logConfig)
if err != nil {
//nolint:sloglint // we do not have an logger yet
Expand Down