go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-03-17 21:07:54 +02:00
Code Issues Releases Activity

fix

Browse Source
This commit is contained in:
chenzhihui 2021-06-14 11:12:58 +08:00
parent ba2607530d
commit f92d4742bb
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
log/filter.go
View File

@ -57,7 +57,7 @@ func NewFilter(logger Logger, opts ...FilterOption) *Filter {
return &options
}
// Log Print log by level and keyvals
// Log Print log by level and keyvals.
func (f *Filter) Log(level Level, keyvals ...interface{}) error {
if f.level > level {
return nil
@ -65,19 +65,18 @@ func (f *Filter) Log(level Level, keyvals ...interface{}) error {
if f.filter != nil && f.filter(level, keyvals...) {
return nil
}
if len(keyvals)%2 == 0 {
for i := 0; i < len(keyvals); i += 2 {
if i > len(keyvals) {
continue
}
k := keyvals[i]
v := keyvals[i+1]
if _, ok := f.key[k]; ok {
keyvals[i+1] = "***"
}
if _, ok := f.value[v]; ok {
keyvals[i+1] = "***"
}
for i := 0; i < len(keyvals); i += 2 {
iv := i + 1
if iv >= len(keyvals) {
continue
}
k := keyvals[i]
v := keyvals[iv]
if _, ok := f.key[k]; ok {
keyvals[i+1] = "***"
}
if _, ok := f.value[v]; ok {
keyvals[i+1] = "***"
}
}
return f.logger.Log(level, keyvals...)

4
log/value.go
View File

@ -33,11 +33,11 @@ func Value(ctx context.Context, v interface{}) interface{} {
func Caller(depth int) Valuer {
return func(context.Context) interface{} {
_, file, line, _ := runtime.Caller(depth)
if strings.LastIndex(file, "/log/helper.go") > 0 {
if strings.LastIndex(file, "/log/filter.go") > 0 {
depth++
_, file, line, _ = runtime.Caller(depth)
}
if strings.LastIndex(file, "/log/filter.go") > 0 {
if strings.LastIndex(file, "/log/helper.go") > 0 {
depth++
_, file, line, _ = runtime.Caller(depth)
}