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
7c2bea66
Commit
7c2bea66
authored
1 year ago
by
ko_oler
Browse files
Options
Downloads
Patches
Plain Diff
revert лишних изменений
parent
ca72ec35
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
logs/zap/buffered_write_syncer_test.go
+6
-6
6 additions, 6 deletions
logs/zap/buffered_write_syncer_test.go
pkg/collections/middleware/logging_middleware.go
+1
-1
1 addition, 1 deletion
pkg/collections/middleware/logging_middleware.go
zap/filter_core.go
+2
-2
2 additions, 2 deletions
zap/filter_core.go
with
9 additions
and
9 deletions
logs/zap/buffered_write_syncer_test.go
+
6
−
6
View file @
7c2bea66
...
...
@@ -24,10 +24,10 @@ func TestBufferedWriteSyncer_Write(t *testing.T) {
ws
:=
&
BufferedWriteSyncer
{
Service
:
service
}
err
:=
ws
.
Write
(
&
logs
.
Entry
{
Message
:
"first log
s
message"
})
err
:=
ws
.
Write
(
&
logs
.
Entry
{
Message
:
"first log message"
})
require
.
NoError
(
t
,
err
)
err
=
ws
.
Write
(
&
logs
.
Entry
{
Message
:
"second log
s
message"
})
err
=
ws
.
Write
(
&
logs
.
Entry
{
Message
:
"second log message"
})
require
.
NoError
(
t
,
err
)
err
=
ws
.
Stop
()
...
...
@@ -53,7 +53,7 @@ func TestBufferedWriteSyncer_Write_Concurrent(t *testing.T) {
wg
.
Add
(
1
)
go
func
(
wg
*
sync
.
WaitGroup
)
{
defer
wg
.
Done
()
require
.
NoError
(
t
,
ws
.
Write
(
&
logs
.
Entry
{
Message
:
"log
s
message"
}))
require
.
NoError
(
t
,
ws
.
Write
(
&
logs
.
Entry
{
Message
:
"log message"
}))
}(
&
wg
)
}
...
...
@@ -77,7 +77,7 @@ func TestBufferedWriteSyncer_Flush(t *testing.T) {
for
i
:=
0
;
i
<
10
;
i
++
{
for
j
:=
0
;
j
<
10
;
j
++
{
require
.
NoError
(
t
,
ws
.
Write
(
&
logs
.
Entry
{
Message
:
"log
s
message"
}))
require
.
NoError
(
t
,
ws
.
Write
(
&
logs
.
Entry
{
Message
:
"log message"
}))
}
require
.
NoError
(
t
,
ws
.
Sync
())
}
...
...
@@ -100,7 +100,7 @@ func TestBufferedWriteSyncer_MaxBufferSize(t *testing.T) {
ws
:=
&
BufferedWriteSyncer
{
Service
:
service
,
MaxBufferSize
:
10
}
for
i
:=
0
;
i
<
100
;
i
++
{
require
.
NoError
(
t
,
ws
.
Write
(
&
logs
.
Entry
{
Message
:
"log
s
message"
}))
require
.
NoError
(
t
,
ws
.
Write
(
&
logs
.
Entry
{
Message
:
"log message"
}))
}
require
.
NoError
(
t
,
ws
.
Stop
())
...
...
@@ -121,7 +121,7 @@ func TestBufferedWriteSyncer_FlushInterval(t *testing.T) {
ws
:=
&
BufferedWriteSyncer
{
Service
:
service
,
FlushInterval
:
time
.
Second
}
for
j
:=
0
;
j
<
10
;
j
++
{
require
.
NoError
(
t
,
ws
.
Write
(
&
logs
.
Entry
{
Message
:
"log
s
message"
}))
require
.
NoError
(
t
,
ws
.
Write
(
&
logs
.
Entry
{
Message
:
"log message"
}))
}
time
.
Sleep
(
3
*
time
.
Second
)
// ждем, пока сработает интервал
...
...
This diff is collapsed.
Click to expand it.
pkg/collections/middleware/logging_middleware.go
+
1
−
1
View file @
7c2bea66
// Code generated by gowrap. DO NOT EDIT.
// template: ../../../assets/templates/middleware/log
s
.tmpl
// template: ../../../assets/templates/middleware/log.tmpl
// gowrap: http://github.com/hexdigest/gowrap
package
middleware
...
...
This diff is collapsed.
Click to expand it.
zap/filter_core.go
+
2
−
2
View file @
7c2bea66
...
...
@@ -67,8 +67,8 @@ type filterCore struct {
// core = WithFilters(core, ContainsField(zap.Int("a", 5)))
//
// logger := zap.New(core)
// logger.Info("Test log
s
") // НЕ будет записан
// logger.Info("Test log
s
", zap.Int("a", 5)) // будет записан
// logger.Info("Test log") // НЕ будет записан
// logger.Info("Test log", zap.Int("a", 5)) // будет записан
func
WithFilters
(
core
zapcore
.
Core
,
filters
...
FilterFunc
)
zapcore
.
Core
{
return
&
filterCore
{
Core
:
core
,
...
...
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