From 93e17dc6e5a0606d1d8a2737ebad377a33b6cd63 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Wed, 28 Feb 2024 13:39:56 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
=?UTF-8?q?=D0=BE=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20?=
=?UTF-8?q?=D0=B8=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20?=
=?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=20=D1=81=D0=BE?=
=?UTF-8?q?=D0=B1=D1=8B=D1=82=D0=B8=D0=B9=20=D0=B2=20logging=5Fmiddleware?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
logs/zap/example_test.go | 8 ++++----
pkg/items/events.go | 16 ++++++++--------
pkg/items/middleware/logging_middleware.go | 16 ++++++++--------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/logs/zap/example_test.go b/logs/zap/example_test.go
index e0db8954..440c8447 100644
--- a/logs/zap/example_test.go
+++ b/logs/zap/example_test.go
@@ -29,7 +29,7 @@ func TestExample(t *testing.T) {
Level: logs.Level(zapcore.InfoLevel),
Message: "Successfully created",
Component: "Items",
- Event: items.EventCreateItem,
+ Event: items.EventItemCreate,
ObjectID: id.MustObjectId(item),
CallerID: id.MustObjectId(user),
Tags: []string{"tag1", "tag2", "tag3"},
@@ -38,7 +38,7 @@ func TestExample(t *testing.T) {
Level: logs.Level(zapcore.WarnLevel),
Message: "Successfully updated",
Component: "Items",
- Event: items.EventUpdateItem,
+ Event: items.EventItemUpdate,
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.EventCreateItem),
+ logzap.Event(items.EventItemCreate),
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.EventUpdateItem),
+ logzap.Event(items.EventItemUpdate),
logzap.Object(item),
logzap.CallerFromContext(ctx),
logzap.Attr(map[string]map[string]any{"title": {"old": "old title", "new": "new title"}}),
diff --git a/pkg/items/events.go b/pkg/items/events.go
index d97fe63c..6d1ced93 100644
--- a/pkg/items/events.go
+++ b/pkg/items/events.go
@@ -7,14 +7,14 @@ import (
)
const (
- EventCreateItem = "create_item"
- EventUpdateItem = "update_item"
- EventPublishItem = "publish_item"
- EventUnpublishItem = "unpublish_item"
- EventDeleteItem = "delete_item"
- EventUndeleteItem = "item_undelete"
- EventArchiveItem = "item_archive"
- EventUnarchiveItem = "item_unarchive"
+ EventItemCreate = "item_create"
+ EventItemUpdate = "item_update"
+ EventItemPublish = "item_publish"
+ EventItemUnpublish = "item_unpublish"
+ EventItemDelete = "item_delete"
+ EventItemUndelete = "item_undelete"
+ EventItemArchive = "item_archive"
+ EventItemUnarchive = "item_unarchive"
DefaultEventSubject = "content.{{.EventType}}.{{.SpaceID}}.{{.EnvID}}.{{.CollectionID}}.{{.ItemID}}"
)
diff --git a/pkg/items/middleware/logging_middleware.go b/pkg/items/middleware/logging_middleware.go
index fe7870a8..e37c7d44 100644
--- a/pkg/items/middleware/logging_middleware.go
+++ b/pkg/items/middleware/logging_middleware.go
@@ -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.EventArchiveItem),
+ logzap.Event(items.EventItemArchive),
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.EventCreateItem),
+ logzap.Event(items.EventItemCreate),
)
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.EventDeleteItem),
+ logzap.Event(items.EventItemDelete),
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.EventPublishItem),
+ logzap.Event(items.EventItemPublish),
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.EventUnarchiveItem),
+ logzap.Event(items.EventItemUnarchive),
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.EventUndeleteItem),
+ logzap.Event(items.EventItemUndelete),
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.EventUnpublishItem),
+ logzap.Event(items.EventItemUnpublish),
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.EventUpdateItem),
+ logzap.Event(items.EventItemUpdate),
logzap.Object(item),
)
--
GitLab