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
9d386e8a
Commit
9d386e8a
authored
1 year ago
by
Alena Petraki
Browse files
Options
Downloads
Patches
Plain Diff
Отменены именования констант EventXXX
parent
318dcb0e
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
log/zap/example_test.go
+4
-4
4 additions, 4 deletions
log/zap/example_test.go
pkg/items/events.go
+8
-8
8 additions, 8 deletions
pkg/items/events.go
pkg/items/middleware/logging_middleware.go
+8
-8
8 additions, 8 deletions
pkg/items/middleware/logging_middleware.go
with
20 additions
and
20 deletions
log/zap/example_test.go
+
4
−
4
View file @
9d386e8a
...
...
@@ -29,7 +29,7 @@ func TestExample(t *testing.T) {
LogLevel
:
log
.
Level
(
zapcore
.
InfoLevel
),
Message
:
"Successfully created"
,
Component
:
"Items"
,
Event
:
items
.
Event
Item
Create
,
Event
:
items
.
EventCreate
Item
,
ObjectID
:
id
.
MustObjectId
(
item
),
CallerID
:
id
.
MustObjectId
(
user
),
Tags
:
[]
string
{
"tag1"
,
"tag2"
,
"tag3"
},
...
...
@@ -38,7 +38,7 @@ func TestExample(t *testing.T) {
LogLevel
:
log
.
Level
(
zapcore
.
WarnLevel
),
Message
:
"Successfully updated"
,
Component
:
"Items"
,
Event
:
items
.
Event
Item
Update
,
Event
:
items
.
EventUpdate
Item
,
ObjectID
:
id
.
MustObjectId
(
item
),
CallerID
:
id
.
MustObjectId
(
user
),
Attr
:
map
[
string
]
map
[
string
]
any
{
"title"
:
{
"old"
:
"old title"
,
"new"
:
"new title"
}},
...
...
@@ -75,7 +75,7 @@ func TestExample(t *testing.T) {
// Отправка лога при создании item
logger
.
Info
(
"Successfully created"
,
logzap
.
Event
(
items
.
Event
Item
Create
),
logzap
.
Event
(
items
.
EventCreate
Item
),
logzap
.
Object
(
item
),
logzap
.
CallerFromContext
(
ctx
),
logzap
.
Tags
(
"tag1"
,
"tag2"
,
"tag3"
),
...
...
@@ -83,7 +83,7 @@ func TestExample(t *testing.T) {
// Отправка лога при обновлении item
logger
.
Warn
(
"Successfully updated"
,
logzap
.
Event
(
items
.
Event
Item
Update
),
logzap
.
Event
(
items
.
EventUpdate
Item
),
logzap
.
Object
(
item
),
logzap
.
CallerFromContext
(
ctx
),
logzap
.
Attr
(
map
[
string
]
map
[
string
]
any
{
"title"
:
{
"old"
:
"old title"
,
"new"
:
"new title"
}}),
...
...
This diff is collapsed.
Click to expand it.
pkg/items/events.go
+
8
−
8
View file @
9d386e8a
...
...
@@ -7,14 +7,14 @@ import (
)
const
(
Event
Item
Create
=
"create_item"
Event
Item
Update
=
"update_item"
Event
Item
Publish
=
"publish_item"
Event
Item
Unpublish
=
"unpublish_item"
Event
Item
Delete
=
"delete_item"
Event
Item
Undelete
=
"item_undelete"
Event
Item
Archive
=
"item_archive"
Event
Item
Unarchive
=
"item_unarchive"
EventCreate
Item
=
"create_item"
EventUpdate
Item
=
"update_item"
EventPublish
Item
=
"publish_item"
EventUnpublish
Item
=
"unpublish_item"
EventDelete
Item
=
"delete_item"
EventUndelete
Item
=
"item_undelete"
EventArchive
Item
=
"item_archive"
EventUnarchive
Item
=
"item_unarchive"
DefaultEventSubject
=
"content.{{.EventType}}.{{.SpaceID}}.{{.EnvID}}.{{.CollectionID}}.{{.ItemID}}"
)
...
...
This diff is collapsed.
Click to expand it.
pkg/items/middleware/logging_middleware.go
+
8
−
8
View file @
9d386e8a
...
...
@@ -55,7 +55,7 @@ func (m *loggingMiddleware) AggregatePublished(ctx context.Context, spaceId stri
func
(
m
*
loggingMiddleware
)
Archive
(
ctx
context
.
Context
,
item
*
items
.
Item
,
options
...*
items
.
ArchiveOptions
)
(
err
error
)
{
logger
:=
m
.
logger
.
With
(
logzap
.
CallerFromContext
(
ctx
),
logzap
.
Event
(
items
.
Event
Item
Archive
),
logzap
.
Event
(
items
.
EventArchive
Item
),
logzap
.
Object
(
item
),
)
...
...
@@ -72,7 +72,7 @@ func (m *loggingMiddleware) Archive(ctx context.Context, item *items.Item, optio
func
(
m
*
loggingMiddleware
)
Create
(
ctx
context
.
Context
,
item
*
items
.
Item
,
opts
...*
items
.
CreateOptions
)
(
created
*
items
.
Item
,
err
error
)
{
logger
:=
m
.
logger
.
With
(
logzap
.
CallerFromContext
(
ctx
),
logzap
.
Event
(
items
.
Event
Item
Create
),
logzap
.
Event
(
items
.
EventCreate
Item
),
)
created
,
err
=
m
.
next
.
Create
(
ctx
,
item
,
opts
...
)
...
...
@@ -88,7 +88,7 @@ func (m *loggingMiddleware) Create(ctx context.Context, item *items.Item, opts .
func
(
m
*
loggingMiddleware
)
Delete
(
ctx
context
.
Context
,
item
*
items
.
Item
,
options
...*
items
.
DeleteOptions
)
(
err
error
)
{
logger
:=
m
.
logger
.
With
(
logzap
.
CallerFromContext
(
ctx
),
logzap
.
Event
(
items
.
Event
Item
Delete
),
logzap
.
Event
(
items
.
EventDelete
Item
),
logzap
.
Object
(
item
),
)
...
...
@@ -223,7 +223,7 @@ func (m *loggingMiddleware) ListRevisions(ctx context.Context, spaceId string, e
func
(
m
*
loggingMiddleware
)
Publish
(
ctx
context
.
Context
,
item
*
items
.
Item
,
options
...*
items
.
PublishOptions
)
(
err
error
)
{
logger
:=
m
.
logger
.
With
(
logzap
.
CallerFromContext
(
ctx
),
logzap
.
Event
(
items
.
Event
Item
Publish
),
logzap
.
Event
(
items
.
EventPublish
Item
),
logzap
.
Object
(
item
),
)
...
...
@@ -240,7 +240,7 @@ func (m *loggingMiddleware) Publish(ctx context.Context, item *items.Item, optio
func
(
m
*
loggingMiddleware
)
Unarchive
(
ctx
context
.
Context
,
item
*
items
.
Item
,
options
...*
items
.
UnarchiveOptions
)
(
err
error
)
{
logger
:=
m
.
logger
.
With
(
logzap
.
CallerFromContext
(
ctx
),
logzap
.
Event
(
items
.
Event
Item
Unarchive
),
logzap
.
Event
(
items
.
EventUnarchive
Item
),
logzap
.
Object
(
item
),
)
...
...
@@ -257,7 +257,7 @@ func (m *loggingMiddleware) Unarchive(ctx context.Context, item *items.Item, opt
func
(
m
*
loggingMiddleware
)
Undelete
(
ctx
context
.
Context
,
item
*
items
.
Item
,
options
...*
items
.
UndeleteOptions
)
(
err
error
)
{
logger
:=
m
.
logger
.
With
(
logzap
.
CallerFromContext
(
ctx
),
logzap
.
Event
(
items
.
Event
Item
Undelete
),
logzap
.
Event
(
items
.
EventUndelete
Item
),
logzap
.
Object
(
item
),
)
...
...
@@ -274,7 +274,7 @@ func (m *loggingMiddleware) Undelete(ctx context.Context, item *items.Item, opti
func
(
m
*
loggingMiddleware
)
Unpublish
(
ctx
context
.
Context
,
item
*
items
.
Item
,
options
...*
items
.
UnpublishOptions
)
(
err
error
)
{
logger
:=
m
.
logger
.
With
(
logzap
.
CallerFromContext
(
ctx
),
logzap
.
Event
(
items
.
Event
Item
Unpublish
),
logzap
.
Event
(
items
.
EventUnpublish
Item
),
logzap
.
Object
(
item
),
)
...
...
@@ -291,7 +291,7 @@ func (m *loggingMiddleware) Unpublish(ctx context.Context, item *items.Item, opt
func
(
m
*
loggingMiddleware
)
Update
(
ctx
context
.
Context
,
item
*
items
.
Item
,
options
...*
items
.
UpdateOptions
)
(
err
error
)
{
logger
:=
m
.
logger
.
With
(
logzap
.
CallerFromContext
(
ctx
),
logzap
.
Event
(
items
.
Event
Item
Update
),
logzap
.
Event
(
items
.
EventUpdate
Item
),
logzap
.
Object
(
item
),
)
...
...
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