From 2e9ad871b3523d0c072c72fc02bf10354c2fbd93 Mon Sep 17 00:00:00 2001 From: Will Browne Date: Fri, 4 Jun 2021 11:06:34 +0200 Subject: [PATCH] remove incorrect use of grafana-cli logger (#35228) --- pkg/infra/metrics/graphitebridge/graphite.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/infra/metrics/graphitebridge/graphite.go b/pkg/infra/metrics/graphitebridge/graphite.go index df63f3cfb11..13e3485ee80 100644 --- a/pkg/infra/metrics/graphitebridge/graphite.go +++ b/pkg/infra/metrics/graphitebridge/graphite.go @@ -27,7 +27,6 @@ import ( "strings" "time" - "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" @@ -203,8 +202,8 @@ func (b *Bridge) Push() error { return err } defer func() { - if err := conn.Close(); err != nil { - logger.Warn("Failed to close connection", "err", err) + if err := conn.Close(); err != nil && b.logger != nil { + b.logger.Println("Failed to close connection", "err", err) } }()