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
4be72d59
Commit
4be72d59
authored
1 year ago
by
Semyon Krestyaninov
Browse files
Options
Downloads
Patches
Plain Diff
refactor
parent
d12334a6
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
log/zap/filter_core.go
+41
-15
41 additions, 15 deletions
log/zap/filter_core.go
log/zap/filter_core_test.go
+62
-1
62 additions, 1 deletion
log/zap/filter_core_test.go
with
103 additions
and
16 deletions
log/zap/filter_core.go
+
41
−
15
View file @
4be72d59
...
@@ -7,8 +7,8 @@ import (
...
@@ -7,8 +7,8 @@ import (
type
FilterFunc
func
(
entry
zapcore
.
Entry
,
fields
[]
zapcore
.
Field
)
bool
type
FilterFunc
func
(
entry
zapcore
.
Entry
,
fields
[]
zapcore
.
Field
)
bool
func
Filter
Field
(
field
zapcore
.
Field
)
FilterFunc
{
func
Has
Field
(
field
zapcore
.
Field
)
FilterFunc
{
return
func
(
entry
zapcore
.
Entry
,
fields
[]
zapcore
.
Field
)
bool
{
return
func
(
_
zapcore
.
Entry
,
fields
[]
zapcore
.
Field
)
bool
{
for
_
,
f
:=
range
fields
{
for
_
,
f
:=
range
fields
{
if
f
.
Equals
(
field
)
{
if
f
.
Equals
(
field
)
{
return
true
return
true
...
@@ -18,24 +18,52 @@ func FilterField(field zapcore.Field) FilterFunc {
...
@@ -18,24 +18,52 @@ func FilterField(field zapcore.Field) FilterFunc {
}
}
}
}
func
Or
(
filters
...
FilterFunc
)
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
)
}
}
type
filterCore
struct
{
type
filterCore
struct
{
zapcore
.
Core
zapcore
.
Core
filter
s
[]
FilterFunc
filter
FilterFunc
fields
[]
zap
.
Field
fields
[]
zap
.
Field
}
}
func
RegisterFilters
(
core
zapcore
.
Core
,
filter
s
...
FilterFunc
)
zapcore
.
Core
{
func
RegisterFilters
(
core
zapcore
.
Core
,
filter
FilterFunc
)
zapcore
.
Core
{
return
&
filterCore
{
return
&
filterCore
{
Core
:
core
,
Core
:
core
,
filter
s
:
filter
s
,
filter
:
filter
,
}
}
}
}
func
(
core
*
filterCore
)
With
(
fields
[]
zapcore
.
Field
)
zapcore
.
Core
{
func
(
core
*
filterCore
)
With
(
fields
[]
zapcore
.
Field
)
zapcore
.
Core
{
return
&
filterCore
{
return
&
filterCore
{
Core
:
core
.
Core
.
With
(
fields
),
Core
:
core
.
Core
.
With
(
fields
),
filter
s
:
core
.
filter
s
,
filter
:
core
.
filter
,
fields
:
append
(
core
.
fields
,
fields
...
),
fields
:
append
(
core
.
fields
,
fields
...
),
}
}
}
}
...
@@ -48,15 +76,13 @@ func (core *filterCore) Check(entry zapcore.Entry, checkedEntry *zapcore.Checked
...
@@ -48,15 +76,13 @@ func (core *filterCore) Check(entry zapcore.Entry, checkedEntry *zapcore.Checked
}
}
func
(
core
*
filterCore
)
Write
(
entry
zapcore
.
Entry
,
fields
[]
zapcore
.
Field
)
error
{
func
(
core
*
filterCore
)
Write
(
entry
zapcore
.
Entry
,
fields
[]
zapcore
.
Field
)
error
{
if
len
(
core
.
fi
lter
s
)
>
0
{
if
len
(
core
.
fi
eld
s
)
>
0
{
fields
=
append
(
core
.
fields
,
fields
...
)
fields
=
append
(
core
.
fields
,
fields
...
)
}
}
for
_
,
filter
:=
range
core
.
filters
{
if
!
core
.
filter
(
entry
,
fields
)
{
if
!
filter
(
entry
,
fields
)
{
return
nil
return
nil
}
}
}
return
core
.
Core
.
Write
(
entry
,
fields
)
return
core
.
Core
.
Write
(
entry
,
fields
)
}
}
This diff is collapsed.
Click to expand it.
log/zap/filter_core_test.go
+
62
−
1
View file @
4be72d59
...
@@ -11,7 +11,7 @@ import (
...
@@ -11,7 +11,7 @@ import (
func
TestFilterCore_Write
(
t
*
testing
.
T
)
{
func
TestFilterCore_Write
(
t
*
testing
.
T
)
{
core
,
logs
:=
observer
.
New
(
zapcore
.
InfoLevel
)
core
,
logs
:=
observer
.
New
(
zapcore
.
InfoLevel
)
core
=
RegisterFilters
(
core
,
Filter
Field
(
zap
.
Bool
(
"check"
,
true
)))
core
=
RegisterFilters
(
core
,
Has
Field
(
zap
.
Bool
(
"check"
,
true
)))
err
:=
core
.
With
([]
zapcore
.
Field
{
zap
.
Bool
(
"check"
,
true
)})
.
Write
(
zapcore
.
Entry
{
Message
:
"msg"
},
nil
)
err
:=
core
.
With
([]
zapcore
.
Field
{
zap
.
Bool
(
"check"
,
true
)})
.
Write
(
zapcore
.
Entry
{
Message
:
"msg"
},
nil
)
require
.
NoError
(
t
,
err
)
require
.
NoError
(
t
,
err
)
...
@@ -24,3 +24,64 @@ func TestFilterCore_Write(t *testing.T) {
...
@@ -24,3 +24,64 @@ func TestFilterCore_Write(t *testing.T) {
require
.
Equal
(
t
,
2
,
logs
.
Len
())
require
.
Equal
(
t
,
2
,
logs
.
Len
())
}
}
func
TestAnd
(
t
*
testing
.
T
)
{
core
,
logs
:=
observer
.
New
(
zapcore
.
InfoLevel
)
core
=
RegisterFilters
(
core
,
And
(
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"
,
2
),
})
require
.
NoError
(
t
,
err
)
err
=
core
.
Write
(
zapcore
.
Entry
{
Message
:
"msg"
},
[]
zapcore
.
Field
{
zap
.
Int
(
"a"
,
1
),
zap
.
Int
(
"b"
,
3
),
})
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
),
})
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