unistack-org/micro-logger-zerolog
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 13 Wiki Activity

Merge pull request #60 from unistack-org/panic_fix

Browse Source 
fix panic
This commit is contained in:
Василий Толстов 2022-02-22 14:17:32 +03:00 committed by GitHub
commit 25787fb5ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zerolog.go
View File

@ -126,7 +126,11 @@ func (l *zeroLogger) Init(opts ...logger.Option) error {
if l.opts.Fields != nil {
data := make(map[string]interface{}, len(l.opts.Fields)/2)
for i := 0; i < len(l.opts.Fields); i += 2 {
data[l.opts.Fields[i].(string)] = l.opts.Fields[i+1]
fld, ok := l.opts.Fields[i].(string)
if !ok {
return fmt.Errorf("field type invalid %T not string", l.opts.Fields[i])
}
data[fld] = l.opts.Fields[i+1]
}
l.zLog = l.zLog.With().Fields(data).Logger()
}
@ -140,12 +144,7 @@ func (l *zeroLogger) Init(opts ...logger.Option) error {
}
func (l *zeroLogger) Fields(fields ...interface{}) logger.Logger {
data := make(map[string]interface{}, len(fields)/2)
for i := 0; i < len(fields); i += 2 {
data[fields[i].(string)] = fields[i+1]
}
l.zLog = l.zLog.With().Fields(data).Logger()
return l
return l.Clone(logger.WithFields(fields...))
}
func (l *zeroLogger) V(level logger.Level) bool {

9
zerolog_test.go
View File

@ -19,10 +19,17 @@ func TestFields(t *testing.T) {
if err := l.Init(); err != nil {
t.Fatal(err)
}
l.Fields("key", "val").Infof(ctx, "message")
nl := l.Fields("key", "val")
nl.Infof(ctx, "message")
if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
t.Fatalf("logger fields not works, buf contains: %s", buf.Bytes())
}
buf.Reset()
mnl := l.Fields(map[string]interface{}{"key": "val"})
mnl.Infof(ctx, "message")
if bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
t.Fatalf("logger fields not works, buf contains: %s", buf.Bytes())
}
}
func TestOutput(t *testing.T) {