From b2e1aa65dc8cc69ff9453221b2c5db2c458cdbe7 Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Mon, 11 May 2026 11:51:29 +0100 Subject: [PATCH] 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 --- fs/rc/rc.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/rc/rc.go b/fs/rc/rc.go index ce58f1076..a418c4921 100644 --- a/fs/rc/rc.go +++ b/fs/rc/rc.go @@ -83,11 +83,6 @@ var OptionsInfo = fs.Options{{ Default: fs.Duration(10 * time.Second), Help: "Interval to check for expired async jobs", 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.AuthConfigInfo, "rc", "RC"). @@ -95,7 +90,8 @@ var OptionsInfo = fs.Options{{ AddPrefix(libhttp.ConfigInfo, "metrics", "Metrics"). AddPrefix(libhttp.AuthConfigInfo, "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() { fs.RegisterGlobalOptions(fs.OptionsInfo{Name: "rc", Opt: &Opt, Options: OptionsInfo})