From 647f7390c6599aa7e4a8747d62ebdfb4ddc5b980 Mon Sep 17 00:00:00 2001 From: oliverpool Date: Thu, 23 Feb 2017 16:29:01 +0100 Subject: [PATCH] Prevent lock malfunction literal copies lock value from metrics --- cmd/tusd/cli/metrics.go | 2 +- prometheuscollector/prometheuscollector.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/tusd/cli/metrics.go b/cmd/tusd/cli/metrics.go index 921d67a..058c750 100644 --- a/cmd/tusd/cli/metrics.go +++ b/cmd/tusd/cli/metrics.go @@ -16,7 +16,7 @@ var MetricsOpenConnections = prometheus.NewGauge(prometheus.GaugeOpts{ func SetupMetrics(handler *tusd.Handler) { prometheus.MustRegister(MetricsOpenConnections) - prometheus.MustRegister(prometheuscollector.New(handler.Metrics)) + prometheus.MustRegister(prometheuscollector.New(&handler.Metrics)) stdout.Printf("Using %s as the metrics path.\n", Flags.MetricsPath) http.Handle(Flags.MetricsPath, prometheus.Handler()) diff --git a/prometheuscollector/prometheuscollector.go b/prometheuscollector/prometheuscollector.go index a7dc95f..caeca98 100644 --- a/prometheuscollector/prometheuscollector.go +++ b/prometheuscollector/prometheuscollector.go @@ -46,11 +46,11 @@ var ( ) type Collector struct { - metrics tusd.Metrics + metrics *tusd.Metrics } // New creates a new collector which read froms the provided Metrics struct. -func New(metrics tusd.Metrics) Collector { +func New(metrics *tusd.Metrics) Collector { return Collector{ metrics: metrics, }