mirror of
https://github.com/prometheus-community/windows_exporter.git
synced 2026-02-17 02:06:35 +00:00
config: multiple web.listen-address args results into an error, if --config.file is defined. (#1876)
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
This commit is contained in:
@@ -163,11 +163,6 @@ func run() int {
|
|||||||
return 1
|
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).
|
// Parse flags once more to include those discovered in configuration file(s).
|
||||||
if _, err = app.Parse(os.Args[1:]); err != nil {
|
if _, err = app.Parse(os.Args[1:]); err != nil {
|
||||||
logger.ErrorContext(ctx, "failed to parse CLI args from YAML file",
|
logger.ErrorContext(ctx, "failed to parse CLI args from YAML file",
|
||||||
@@ -177,6 +172,12 @@ func run() int {
|
|||||||
return 1
|
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)
|
logger, err = log.New(logConfig)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
//nolint:sloglint // we do not have an logger yet
|
//nolint:sloglint // we do not have an logger yet
|
||||||
|
|||||||
Reference in New Issue
Block a user