mirrors/statsd_exporter
1
0
Fork 1
mirror of https://github.com/prometheus/statsd_exporter.git synced 2024-11-25 08:41:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #453 from prometheus/mr/guard-logger-fsm

Browse source 
mapper: Make sure we have a logger before backtracking check
This commit is contained in:
Matthias Rampke 2022-07-29 15:06:37 +00:00 committed by GitHub
commit af84364004
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/mapper/mapper.go
View file

@ -233,6 +233,10 @@ func (m *MetricMapper) InitFromYAMLString(fileContents string) error {
m.mutex.Lock() m.mutex.Lock()
defer m.mutex.Unlock() defer m.mutex.Unlock()
if m.Logger == nil {
m.Logger = log.NewNopLogger()
}
m.Defaults = n.Defaults m.Defaults = n.Defaults
m.Mappings = n.Mappings m.Mappings = n.Mappings
@ -259,10 +263,6 @@ func (m *MetricMapper) InitFromYAMLString(fileContents string) error {
m.MappingsCount.Set(float64(len(n.Mappings))) m.MappingsCount.Set(float64(len(n.Mappings)))
} }
if m.Logger == nil {
m.Logger = log.NewNopLogger()
}
return nil return nil
} }