mirror of
https://github.com/go-kratos/kratos.git
synced 2025-03-17 21:07:54 +02:00
style:log (#2014)
This commit is contained in:
parent
5e0744a47b
commit
2eb615b38a
@ -66,13 +66,13 @@ func (f *Filter) Log(level Level, keyvals ...interface{}) error {
|
||||
}
|
||||
// fkv is used to provide a slice to contains both logger.prefix and keyvals for filter
|
||||
var fkv []interface{}
|
||||
if l, ok := f.logger.(*logger); ok {
|
||||
if len(l.prefix) > 0 {
|
||||
fkv = make([]interface{}, 0, len(l.prefix)+len(keyvals))
|
||||
fkv = append(fkv, l.prefix...)
|
||||
fkv = append(fkv, keyvals...)
|
||||
}
|
||||
} else {
|
||||
l, ok := f.logger.(*logger)
|
||||
if ok && len(l.prefix) > 0 {
|
||||
fkv = make([]interface{}, 0, len(l.prefix)+len(keyvals))
|
||||
fkv = append(fkv, l.prefix...)
|
||||
fkv = append(fkv, keyvals...)
|
||||
}
|
||||
if !ok {
|
||||
fkv = keyvals
|
||||
}
|
||||
if f.filter != nil && f.filter(level, fkv...) {
|
||||
|
@ -19,9 +19,7 @@ func WithWriterLevel(level Level) WriterOptionFn {
|
||||
// WithWriteMessageKey set writerWrapper helper message key.
|
||||
func WithWriteMessageKey(key string) WriterOptionFn {
|
||||
return func(w *writerWrapper) {
|
||||
if key != "" {
|
||||
w.helper.msgKey = key
|
||||
}
|
||||
w.helper.msgKey = key
|
||||
}
|
||||
}
|
||||
|
||||
|
40
log/log.go
40
log/log.go
@ -37,32 +37,34 @@ func (c *logger) Log(level Level, keyvals ...interface{}) error {
|
||||
|
||||
// With with logger fields.
|
||||
func With(l Logger, kv ...interface{}) Logger {
|
||||
if c, ok := l.(*logger); ok {
|
||||
kvs := make([]interface{}, 0, len(c.prefix)+len(kv))
|
||||
kvs = append(kvs, kv...)
|
||||
kvs = append(kvs, c.prefix...)
|
||||
return &logger{
|
||||
logs: c.logs,
|
||||
prefix: kvs,
|
||||
hasValuer: containsValuer(kvs),
|
||||
ctx: c.ctx,
|
||||
}
|
||||
c, ok := l.(*logger)
|
||||
if !ok {
|
||||
return &logger{logs: []Logger{l}, prefix: kv, hasValuer: containsValuer(kv)}
|
||||
}
|
||||
kvs := make([]interface{}, 0, len(c.prefix)+len(kv))
|
||||
kvs = append(kvs, kv...)
|
||||
kvs = append(kvs, c.prefix...)
|
||||
return &logger{
|
||||
logs: c.logs,
|
||||
prefix: kvs,
|
||||
hasValuer: containsValuer(kvs),
|
||||
ctx: c.ctx,
|
||||
}
|
||||
return &logger{logs: []Logger{l}, prefix: kv, hasValuer: containsValuer(kv)}
|
||||
}
|
||||
|
||||
// WithContext returns a shallow copy of l with its context changed
|
||||
// to ctx. The provided ctx must be non-nil.
|
||||
func WithContext(ctx context.Context, l Logger) Logger {
|
||||
if c, ok := l.(*logger); ok {
|
||||
return &logger{
|
||||
logs: c.logs,
|
||||
prefix: c.prefix,
|
||||
hasValuer: c.hasValuer,
|
||||
ctx: ctx,
|
||||
}
|
||||
c, ok := l.(*logger)
|
||||
if !ok {
|
||||
return &logger{logs: []Logger{l}, ctx: ctx}
|
||||
}
|
||||
return &logger{
|
||||
logs: c.logs,
|
||||
prefix: c.prefix,
|
||||
hasValuer: c.hasValuer,
|
||||
ctx: ctx,
|
||||
}
|
||||
return &logger{logs: []Logger{l}, ctx: ctx}
|
||||
}
|
||||
|
||||
// MultiLogger wraps multi logger.
|
||||
|
Loading…
x
Reference in New Issue
Block a user