From 3e87b5fd13db7c0d993212d4952511ab00f86607 Mon Sep 17 00:00:00 2001 From: Alex Petraky <petraky@perx.ru> Date: Tue, 2 Apr 2024 09:13:50 +0000 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?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BE=D0=BB=D0=BB=D0=B5=D0=BA?= =?UTF-8?q?=D1=86=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/collections/events.go | 8 ++++---- pkg/collections/middleware/logging_middleware.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/collections/events.go b/pkg/collections/events.go index bdc92e77..516d5c5c 100644 --- a/pkg/collections/events.go +++ b/pkg/collections/events.go @@ -1,8 +1,8 @@ package collections const ( - EventCollectionCreate = "collection_create" - EventCollectionUpdate = "collection_update" - EventCollectionDelete = "collection_delete" - EventCollectionSetSchema = "collection_set_schema" + EventCreate = "collection.create" + EventUpdate = "collection.update" + EventDelete = "collection.delete" + EventSetSchema = "collection.set_schema" ) diff --git a/pkg/collections/middleware/logging_middleware.go b/pkg/collections/middleware/logging_middleware.go index 14c28d13..3c80eda4 100644 --- a/pkg/collections/middleware/logging_middleware.go +++ b/pkg/collections/middleware/logging_middleware.go @@ -31,7 +31,7 @@ func (m *loggingMiddleware) Create(ctx context.Context, collection *collections. } logger := m.logger.With( logzap.CallerFromContext(ctx, spaceID), - logzap.Event(collections.EventCollectionCreate), + logzap.Event(collections.EventCreate), ) created, err = m.next.Create(ctx, collection) @@ -47,7 +47,7 @@ func (m *loggingMiddleware) Create(ctx context.Context, collection *collections. func (m *loggingMiddleware) Delete(ctx context.Context, spaceId string, envId string, collectionId string) (err error) { logger := m.logger.With( logzap.CallerFromContext(ctx, spaceId), - logzap.Event(collections.EventCollectionDelete), + logzap.Event(collections.EventDelete), logzap.Object(id.NewCollectionId(spaceId, envId, collectionId)), ) @@ -92,7 +92,7 @@ func (m *loggingMiddleware) List(ctx context.Context, spaceId string, envId stri func (m *loggingMiddleware) SetSchema(ctx context.Context, spaceId string, envId string, collectionId string, schema *schema.Schema) (err error) { logger := m.logger.With( logzap.CallerFromContext(ctx, spaceId), - logzap.Event(collections.EventCollectionSetSchema), + logzap.Event(collections.EventSetSchema), logzap.Object(id.NewCollectionId(spaceId, envId, collectionId)), ) @@ -128,7 +128,7 @@ func (m *loggingMiddleware) Update(ctx context.Context, coll *collections.Collec } logger := m.logger.With( logzap.CallerFromContext(ctx, spaceID), - logzap.Event(collections.EventCollectionUpdate), + logzap.Event(collections.EventUpdate), logzap.Object(coll), ) -- GitLab