remove incorrect use of grafana-cli logger (#35228) (#35236)

(cherry picked from commit 2e9ad871b3)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
This commit is contained in:
Grot (@grafanabot)andWill Browne authored and GitHub committed 2021-06-04 11:32:06 +02:00
1 parent f5c55ffbe3
commit bc49ceddb7
1 file changed
+2 -3
+2 -3
View File
@@ -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)
}
}()