From 9d386e8afe4156650ca3d066c19ad59f017dcaf1 Mon Sep 17 00:00:00 2001 From: "a.petraki" <a.petraki@perx.ru> Date: Tue, 20 Feb 2024 16:43:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=20Eve?= =?UTF-8?q?ntXXX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- log/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/log/zap/example_test.go b/log/zap/example_test.go index 0ffb282a..1c506d15 100644 --- a/log/zap/example_test.go +++ b/log/zap/example_test.go @@ -29,7 +29,7 @@ func TestExample(t *testing.T) { LogLevel: log.Level(zapcore.InfoLevel), Message: "Successfully created", Component: "Items", - Event: items.EventItemCreate, + Event: items.EventCreateItem, 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.EventItemUpdate, + Event: items.EventUpdateItem, 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.EventItemCreate), + logzap.Event(items.EventCreateItem), 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.EventItemUpdate), + logzap.Event(items.EventUpdateItem), 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 9a1eb924..d97fe63c 100644 --- a/pkg/items/events.go +++ b/pkg/items/events.go @@ -7,14 +7,14 @@ import ( ) const ( - EventItemCreate = "create_item" - EventItemUpdate = "update_item" - EventItemPublish = "publish_item" - EventItemUnpublish = "unpublish_item" - EventItemDelete = "delete_item" - EventItemUndelete = "item_undelete" - EventItemArchive = "item_archive" - EventItemUnarchive = "item_unarchive" + EventCreateItem = "create_item" + EventUpdateItem = "update_item" + EventPublishItem = "publish_item" + EventUnpublishItem = "unpublish_item" + EventDeleteItem = "delete_item" + EventUndeleteItem = "item_undelete" + EventArchiveItem = "item_archive" + EventUnarchiveItem = "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 8870912f..7b310b33 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.EventItemArchive), + logzap.Event(items.EventArchiveItem), 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.EventItemCreate), + logzap.Event(items.EventCreateItem), ) 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.EventItemDelete), + logzap.Event(items.EventDeleteItem), 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.EventItemPublish), + logzap.Event(items.EventPublishItem), 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.EventItemUnarchive), + logzap.Event(items.EventUnarchiveItem), 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.EventItemUndelete), + logzap.Event(items.EventUndeleteItem), 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.EventItemUnpublish), + logzap.Event(items.EventUnpublishItem), 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.EventItemUpdate), + logzap.Event(items.EventUpdateItem), logzap.Object(item), ) -- GitLab