Skip to content

Commit 44e15a0

Browse files
committed
Fix deadlock
1 parent e94b8c0 commit 44e15a0

File tree

1 file changed

+14
-17
lines changed
  • internal/receiver/smartagentreceiver

1 file changed

+14
-17
lines changed

internal/receiver/smartagentreceiver/log.go

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -187,23 +187,6 @@ func (l *logrusToZap) unRedirect(src logrusKey, dst *zap.Logger) {
187187
l.loggerMap[src] = keep
188188
}
189189

190-
func (l *logrusToZap) loggerMapValue0(src logrusKey) (*zap.Logger, bool) {
191-
l.mu.Lock()
192-
defer l.mu.Unlock()
193-
194-
if l.loggerMap == nil {
195-
return nil, false
196-
}
197-
198-
loggers, inMap := l.loggerMap[src]
199-
200-
if len(loggers) > 0 {
201-
return loggers[0], inMap
202-
}
203-
204-
return nil, inMap
205-
}
206-
207190
// Levels is a logrus.Hook implementation that returns all logrus logging levels.
208191
func (l *logrusToZap) Levels() []logrus.Level {
209192
return logrus.AllLevels
@@ -245,3 +228,17 @@ func (l *logrusToZap) Fire(e *logrus.Entry) error {
245228

246229
return nil
247230
}
231+
232+
func (l *logrusToZap) loggerMapValue0(src logrusKey) (*zap.Logger, bool) {
233+
if l.loggerMap == nil {
234+
return nil, false
235+
}
236+
237+
loggers, inMap := l.loggerMap[src]
238+
239+
if len(loggers) > 0 {
240+
return loggers[0], inMap
241+
}
242+
243+
return nil, inMap
244+
}

0 commit comments

Comments
 (0)