Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
perxis-go
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Package registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
perxis
perxis-go
Commits
e7750115
Commit
e7750115
authored
1 year ago
by
Semyon Krestyaninov
Browse files
Options
Downloads
Patches
Plain Diff
refactor
parent
6a0258b9
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
log/zap/filter_core.go
+13
-33
13 additions, 33 deletions
log/zap/filter_core.go
log/zap/filter_core_test.go
+3
-42
3 additions, 42 deletions
log/zap/filter_core_test.go
with
16 additions
and
75 deletions
log/zap/filter_core.go
+
13
−
33
View file @
e7750115
...
...
@@ -18,55 +18,33 @@ func HasField(field zapcore.Field) FilterFunc {
}
}
func
Or
(
filters
...
FilterFunc
)
FilterFunc
{
func
NotHasField
(
field
zapcore
.
Field
)
FilterFunc
{
return
func
(
entry
zapcore
.
Entry
,
fields
[]
zapcore
.
Field
)
bool
{
for
_
,
filter
:=
range
filters
{
if
filter
(
entry
,
fields
)
{
return
true
}
}
return
false
}
}
func
And
(
filters
...
FilterFunc
)
FilterFunc
{
return
func
(
entry
zapcore
.
Entry
,
fields
[]
zapcore
.
Field
)
bool
{
for
_
,
filter
:=
range
filters
{
if
!
filter
(
entry
,
fields
)
{
return
false
}
}
return
true
}
}
func
Not
(
filter
FilterFunc
)
FilterFunc
{
return
func
(
entry
zapcore
.
Entry
,
fields
[]
zapcore
.
Field
)
bool
{
return
!
filter
(
entry
,
fields
)
return
!
HasField
(
field
)(
entry
,
fields
)
}
}
type
filterCore
struct
{
zapcore
.
Core
filter
FilterFunc
filter
s
[]
FilterFunc
// fields хранит контекст записей ядра, передаваемых при вызове With.
// В методе Write передаются только поля конкретной записи, но мы также хотим учитывать поля контекста ядра.
fields
[]
zap
.
Field
}
func
RegisterFilters
(
core
zapcore
.
Core
,
filter
FilterFunc
)
zapcore
.
Core
{
func
RegisterFilters
(
core
zapcore
.
Core
,
filter
s
...
FilterFunc
)
zapcore
.
Core
{
return
&
filterCore
{
Core
:
core
,
filter
:
filter
,
filter
s
:
filter
s
,
}
}
func
(
core
*
filterCore
)
With
(
fields
[]
zapcore
.
Field
)
zapcore
.
Core
{
return
&
filterCore
{
Core
:
core
.
Core
.
With
(
fields
),
filter
:
core
.
filter
,
filter
s
:
core
.
filter
s
,
fields
:
append
(
core
.
fields
,
fields
...
),
}
}
...
...
@@ -83,9 +61,11 @@ func (core *filterCore) Write(entry zapcore.Entry, fields []zapcore.Field) error
fields
=
append
(
core
.
fields
,
fields
...
)
}
if
!
core
.
filter
(
entry
,
fields
)
{
for
_
,
filter
:=
range
core
.
filters
{
if
!
filter
(
entry
,
fields
)
{
return
nil
}
}
return
core
.
Core
.
Write
(
entry
,
fields
)
}
This diff is collapsed.
Click to expand it.
log/zap/filter_core_test.go
+
3
−
42
View file @
e7750115
...
...
@@ -25,12 +25,9 @@ func TestFilterCore_Write(t *testing.T) {
require
.
Equal
(
t
,
2
,
logs
.
Len
())
}
func
Test
An
d
(
t
*
testing
.
T
)
{
func
Test
NotHasFiel
d
(
t
*
testing
.
T
)
{
core
,
logs
:=
observer
.
New
(
zapcore
.
InfoLevel
)
core
=
RegisterFilters
(
core
,
And
(
HasField
(
zap
.
Int
(
"a"
,
1
)),
HasField
(
zap
.
Int
(
"b"
,
2
)),
))
core
=
RegisterFilters
(
core
,
NotHasField
(
zap
.
Int
(
"b"
,
2
)))
err
:=
core
.
Write
(
zapcore
.
Entry
{
Message
:
"msg"
},
[]
zapcore
.
Field
{
zap
.
Int
(
"a"
,
1
),
...
...
@@ -44,44 +41,8 @@ func TestAnd(t *testing.T) {
})
require
.
NoError
(
t
,
err
)
require
.
Equal
(
t
,
1
,
logs
.
Len
())
}
func
TestOr
(
t
*
testing
.
T
)
{
core
,
logs
:=
observer
.
New
(
zapcore
.
InfoLevel
)
core
=
RegisterFilters
(
core
,
Or
(
HasField
(
zap
.
Int
(
"a"
,
1
)),
HasField
(
zap
.
Int
(
"b"
,
2
)),
))
err
:=
core
.
Write
(
zapcore
.
Entry
{
Message
:
"msg"
},
[]
zapcore
.
Field
{
zap
.
Int
(
"a"
,
1
),
zap
.
Int
(
"b"
,
3
),
})
require
.
NoError
(
t
,
err
)
err
=
core
.
Write
(
zapcore
.
Entry
{
Message
:
"msg"
},
[]
zapcore
.
Field
{
zap
.
Int
(
"a"
,
3
),
zap
.
Int
(
"b"
,
2
),
})
err
=
core
.
Write
(
zapcore
.
Entry
{
Message
:
"msg"
},
[]
zapcore
.
Field
{})
require
.
NoError
(
t
,
err
)
require
.
Equal
(
t
,
2
,
logs
.
Len
())
}
func
TestNot
(
t
*
testing
.
T
)
{
core
,
logs
:=
observer
.
New
(
zapcore
.
InfoLevel
)
core
=
RegisterFilters
(
core
,
Not
(
HasField
(
zap
.
Int
(
"a"
,
1
))))
err
:=
core
.
Write
(
zapcore
.
Entry
{
Message
:
"msg"
},
[]
zapcore
.
Field
{
zap
.
Int
(
"a"
,
1
),
})
require
.
NoError
(
t
,
err
)
err
=
core
.
Write
(
zapcore
.
Entry
{
Message
:
"msg"
},
[]
zapcore
.
Field
{
zap
.
Int
(
"a"
,
2
),
})
require
.
NoError
(
t
,
err
)
require
.
Equal
(
t
,
1
,
logs
.
Len
())
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment