unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

Merge pull request #164 from unistack-org/logger-clone-fix

Browse Source 
logger: fix Clone
This commit was merged in pull request #164.
This commit is contained in:
Василий Толстов
2023-01-06 22:44:26 +03:00
committed by GitHub
parent c209892ce8 a7f84e0baa
commit 0d63723ed3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
logger/default.go
View File

@@ -49,7 +49,7 @@ func (l *defaultLogger) Clone(opts ...Option) Logger {
oldopts.Wrappers = newopts.Wrappers oldopts.Wrappers = newopts.Wrappers
l.Lock() l.Lock()
cl := &defaultLogger{opts: oldopts, logFunc: l.logFunc, logfFunc: l.logfFunc} cl := &defaultLogger{opts: oldopts, logFunc: l.logFunc, logfFunc: l.logfFunc, enc: json.NewEncoder(l.opts.Out)}
l.Unlock() l.Unlock()
// wrap the Log func // wrap the Log func

4
logger/unwrap/unwrap_test.go
View File

@@ -86,12 +86,12 @@ func TestTaggedNested(t *testing.T) {
unk string unk string
} }
type str struct { type str struct {
key string `logger:"omit"`
val *val `logger:"take"` val *val `logger:"take"`
key string `logger:"omit"`
} }
var iface interface{} var iface interface{}
v := &str{val: &val{key: "test", unk: "unk"}} v := &str{key: "omit", val: &val{key: "test", val: "omit", unk: "unk"}}
iface = v iface = v
buf := fmt.Sprintf("%#v", Unwrap(iface, Tagged(true))) buf := fmt.Sprintf("%#v", Unwrap(iface, Tagged(true)))
if strings.Compare(buf, `&unwrap.str{val:(*unwrap.val){key:"test"}}`) != 0 { if strings.Compare(buf, `&unwrap.str{val:(*unwrap.val){key:"test"}}`) != 0 {