From bc43c5606d7dd21afb972d007dca09a8e21ed123 Mon Sep 17 00:00:00 2001 From: Matthias Rampke Date: Fri, 29 Jul 2022 11:46:57 +0000 Subject: [PATCH] mapper: Make sure we have a logger before backtracking check The FSM backtracking detection issues a log line. Make sure there is a non-nil logger before doing that. Avoids the crash in prometheus/graphite_exporter#197. Signed-off-by: Matthias Rampke --- pkg/mapper/mapper.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/mapper/mapper.go b/pkg/mapper/mapper.go index 1471444..0c31d89 100644 --- a/pkg/mapper/mapper.go +++ b/pkg/mapper/mapper.go @@ -233,6 +233,10 @@ func (m *MetricMapper) InitFromYAMLString(fileContents string) error { m.mutex.Lock() defer m.mutex.Unlock() + if m.Logger == nil { + m.Logger = log.NewNopLogger() + } + m.Defaults = n.Defaults m.Mappings = n.Mappings @@ -259,10 +263,6 @@ func (m *MetricMapper) InitFromYAMLString(fileContents string) error { m.MappingsCount.Set(float64(len(n.Mappings))) } - if m.Logger == nil { - m.Logger = log.NewNopLogger() - } - return nil }