rc: remove duplicate metrics_addr option registration
The metrics_addr option was registered twice: once explicitly and once implicitly via AddPrefix(libhttp.ConfigInfo, "metrics", ...). Both pointed at the same MetricsHTTP.ListenAddr field, so options/info returned a duplicate entry. Drop the explicit entry and use SetDefault to keep the empty default (so the metrics server stays off unless configured), matching the pattern already used for rc_addr. Fixes #9419
This commit is contained in:
+2
-6
@@ -83,11 +83,6 @@ var OptionsInfo = fs.Options{{
|
|||||||
Default: fs.Duration(10 * time.Second),
|
Default: fs.Duration(10 * time.Second),
|
||||||
Help: "Interval to check for expired async jobs",
|
Help: "Interval to check for expired async jobs",
|
||||||
Groups: "RC",
|
Groups: "RC",
|
||||||
}, {
|
|
||||||
Name: "metrics_addr",
|
|
||||||
Default: []string{},
|
|
||||||
Help: "IPaddress:Port or :Port to bind metrics server to",
|
|
||||||
Groups: "Metrics",
|
|
||||||
}}.
|
}}.
|
||||||
AddPrefix(libhttp.ConfigInfo, "rc", "RC").
|
AddPrefix(libhttp.ConfigInfo, "rc", "RC").
|
||||||
AddPrefix(libhttp.AuthConfigInfo, "rc", "RC").
|
AddPrefix(libhttp.AuthConfigInfo, "rc", "RC").
|
||||||
@@ -95,7 +90,8 @@ var OptionsInfo = fs.Options{{
|
|||||||
AddPrefix(libhttp.ConfigInfo, "metrics", "Metrics").
|
AddPrefix(libhttp.ConfigInfo, "metrics", "Metrics").
|
||||||
AddPrefix(libhttp.AuthConfigInfo, "metrics", "Metrics").
|
AddPrefix(libhttp.AuthConfigInfo, "metrics", "Metrics").
|
||||||
AddPrefix(libhttp.TemplateConfigInfo, "metrics", "Metrics").
|
AddPrefix(libhttp.TemplateConfigInfo, "metrics", "Metrics").
|
||||||
SetDefault("rc_addr", []string{"localhost:5572"})
|
SetDefault("rc_addr", []string{"localhost:5572"}).
|
||||||
|
SetDefault("metrics_addr", []string{})
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
fs.RegisterGlobalOptions(fs.OptionsInfo{Name: "rc", Opt: &Opt, Options: OptionsInfo})
|
fs.RegisterGlobalOptions(fs.OptionsInfo{Name: "rc", Opt: &Opt, Options: OptionsInfo})
|
||||||
|
|||||||
Reference in New Issue
Block a user