1
0
mirror of https://github.com/go-micro/go-micro.git synced 2025-06-12 22:07:47 +02:00

Remove fields map from Helper, add Extract method and fix for defaultLogger.Fields (#2274)

This commit is contained in:
gregkv
2021-09-19 12:40:09 +03:00
committed by GitHub
parent ad532522ea
commit 00d819a199
4 changed files with 58 additions and 25 deletions

View File

@ -19,7 +19,7 @@ func init() {
lvl = InfoLevel
}
DefaultLogger = NewHelper(NewLogger(WithLevel(lvl)))
DefaultLogger = NewLogger(WithLevel(lvl))
}
type defaultLogger struct {
@ -41,9 +41,23 @@ func (l *defaultLogger) String() string {
func (l *defaultLogger) Fields(fields map[string]interface{}) Logger {
l.Lock()
l.opts.Fields = copyFields(fields)
nfields := make(map[string]interface{}, len(l.opts.Fields))
for k, v := range l.opts.Fields {
nfields[k] = v
}
l.Unlock()
return l
for k, v := range fields {
nfields[k] = v
}
return &defaultLogger{opts: Options{
Level: l.opts.Level,
Fields: nfields,
Out: l.opts.Out,
CallerSkipCount: l.opts.CallerSkipCount,
Context: l.opts.Context,
}}
}
func copyFields(src map[string]interface{}) map[string]interface{} {