From 1e15538f53fd463cc0dfb9efe9e2cefb260f87e5 Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Wed, 13 Jul 2022 15:37:08 +0200 Subject: [PATCH 1/3] Fix memberlist log Signed-off-by: Marco Pracucci --- kv/memberlist/memberlist_client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kv/memberlist/memberlist_client.go b/kv/memberlist/memberlist_client.go index 87d0485e5..9c4c78ab6 100644 --- a/kv/memberlist/memberlist_client.go +++ b/kv/memberlist/memberlist_client.go @@ -427,7 +427,7 @@ func (m *KV) buildMemberlistConfig() (*memberlist.Config, error) { mlCfg.ProbeInterval = 5 * time.Second // Probe a random node every this interval. This setting is also the total timeout for the direct + indirect probes. mlCfg.ProbeTimeout = 2 * time.Second // Timeout for the direct probe. - level.Info(m.logger).Log("msg", "Using memberlist cluster label %q and node name %q", mlCfg.Label, mlCfg.Name) + level.Info(m.logger).Log("msg", fmt.Sprintf("Using memberlist cluster label %q and node name %q", mlCfg.Label, mlCfg.Name)) return mlCfg, nil } From 71a5d3808526f0b8dfea11093c08d3524e405ad3 Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Wed, 13 Jul 2022 16:44:52 +0200 Subject: [PATCH 2/3] Update kv/memberlist/memberlist_client.go Co-authored-by: Nick Pillitteri <56quarters@users.noreply.github.com> --- kv/memberlist/memberlist_client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kv/memberlist/memberlist_client.go b/kv/memberlist/memberlist_client.go index 9c4c78ab6..ebdaec36c 100644 --- a/kv/memberlist/memberlist_client.go +++ b/kv/memberlist/memberlist_client.go @@ -427,7 +427,7 @@ func (m *KV) buildMemberlistConfig() (*memberlist.Config, error) { mlCfg.ProbeInterval = 5 * time.Second // Probe a random node every this interval. This setting is also the total timeout for the direct + indirect probes. mlCfg.ProbeTimeout = 2 * time.Second // Timeout for the direct probe. - level.Info(m.logger).Log("msg", fmt.Sprintf("Using memberlist cluster label %q and node name %q", mlCfg.Label, mlCfg.Name)) + level.Info(m.logger).Log("msg", "Using memberlist cluster label and node name", "cluster_label", mlCfg.Label, "node", mlCfg.Name)) return mlCfg, nil } From fc0dc31843e9daacd3c116966d99fd1da5519b1e Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Wed, 13 Jul 2022 17:22:50 +0200 Subject: [PATCH 3/3] Update kv/memberlist/memberlist_client.go --- kv/memberlist/memberlist_client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kv/memberlist/memberlist_client.go b/kv/memberlist/memberlist_client.go index ebdaec36c..22840473a 100644 --- a/kv/memberlist/memberlist_client.go +++ b/kv/memberlist/memberlist_client.go @@ -427,7 +427,7 @@ func (m *KV) buildMemberlistConfig() (*memberlist.Config, error) { mlCfg.ProbeInterval = 5 * time.Second // Probe a random node every this interval. This setting is also the total timeout for the direct + indirect probes. mlCfg.ProbeTimeout = 2 * time.Second // Timeout for the direct probe. - level.Info(m.logger).Log("msg", "Using memberlist cluster label and node name", "cluster_label", mlCfg.Label, "node", mlCfg.Name)) + level.Info(m.logger).Log("msg", "Using memberlist cluster label and node name", "cluster_label", mlCfg.Label, "node", mlCfg.Name) return mlCfg, nil }