diff --git a/logs/zap/example_test.go b/logs/zap/example_test.go index e0db8954ffa3346acf55446342fb3bc80fca2e98..d52fd7a62f10cbeba63782570a5277bb5ed2e358 100644 --- a/logs/zap/example_test.go +++ b/logs/zap/example_test.go @@ -27,7 +27,7 @@ func TestExample(t *testing.T) { wantEntries := []*logs.Entry{ { Level: logs.Level(zapcore.InfoLevel), - Message: "Successfully created", + Message: "Item created", Component: "Items", Event: items.EventCreateItem, ObjectID: id.MustObjectId(item), @@ -36,7 +36,7 @@ func TestExample(t *testing.T) { }, { Level: logs.Level(zapcore.WarnLevel), - Message: "Successfully updated", + Message: "Item updated", Component: "Items", Event: items.EventUpdateItem, ObjectID: id.MustObjectId(item), @@ -74,7 +74,7 @@ func TestExample(t *testing.T) { ctx := auth.WithPrincipal(context.Background(), factory.User("74d90aaf")) // Отправка лога при создании item - logger.Info("Successfully created", + logger.Info("Item created", logzap.Event(items.EventCreateItem), logzap.Object(item), logzap.CallerFromContext(ctx), @@ -82,7 +82,7 @@ func TestExample(t *testing.T) { ) // Отправка лога при обновлении item - logger.Warn("Successfully updated", + logger.Warn("Item updated", logzap.Event(items.EventUpdateItem), logzap.Object(item), logzap.CallerFromContext(ctx), diff --git a/pkg/collections/middleware/logging_middleware.go b/pkg/collections/middleware/logging_middleware.go index fb12be9fa3a0b7e05603cc418b5ec7505048a7f9..1ad44e93af49839eff83ff0762e1232653343506 100644 --- a/pkg/collections/middleware/logging_middleware.go +++ b/pkg/collections/middleware/logging_middleware.go @@ -36,7 +36,7 @@ func (m *loggingMiddleware) Create(ctx context.Context, collection *collections. return } - logger.Info("Successfully created", logzap.Object(created), logzap.Channels(logzap.Userlog)) + logger.Info("Collection created", logzap.Object(created), logzap.Channels(logzap.Userlog)) return created, err } @@ -53,7 +53,7 @@ func (m *loggingMiddleware) Delete(ctx context.Context, spaceId string, envId st return } - logger.Info("Successfully deleted", logzap.Channels(logzap.Userlog)) + logger.Info("Collection deleted", logzap.Channels(logzap.Userlog)) return err } @@ -98,7 +98,7 @@ func (m *loggingMiddleware) SetSchema(ctx context.Context, spaceId string, envId return } - logger.Info("Successfully set schema", logzap.Channels(logzap.Userlog)) + logger.Info("Set collection's schema", logzap.Channels(logzap.Userlog)) return err } @@ -113,7 +113,7 @@ func (m *loggingMiddleware) SetState(ctx context.Context, spaceId string, envId return } - logger.Info("Successfully set state", logzap.Channels(logzap.Userlog)) + logger.Info("Set collection's state", logzap.Channels(logzap.Userlog)) return err } @@ -130,6 +130,6 @@ func (m *loggingMiddleware) Update(ctx context.Context, coll *collections.Collec return } - logger.Info("Successfully updated", logzap.Channels(logzap.Userlog)) + logger.Info("Collection updated", logzap.Channels(logzap.Userlog)) return err } diff --git a/pkg/items/middleware/logging_middleware.go b/pkg/items/middleware/logging_middleware.go index e2829a4261b42dbbc8ce7a52bcdcf0d3dd21ff05..282aee9399db6ebf84f82188a43f71e3392ef4ef 100644 --- a/pkg/items/middleware/logging_middleware.go +++ b/pkg/items/middleware/logging_middleware.go @@ -65,7 +65,7 @@ func (m *loggingMiddleware) Archive(ctx context.Context, item *items.Item, optio return } - logger.Info("Successfully archived", logzap.Channels(logzap.Userlog)) + logger.Info("Item archived", logzap.Channels(logzap.Userlog)) return err } @@ -81,7 +81,7 @@ func (m *loggingMiddleware) Create(ctx context.Context, item *items.Item, opts . return } - logger.Info("Successfully created", logzap.Channels(logzap.Userlog), logzap.Object(created)) + logger.Info("Item created", logzap.Channels(logzap.Userlog), logzap.Object(created)) return created, err } @@ -98,7 +98,7 @@ func (m *loggingMiddleware) Delete(ctx context.Context, item *items.Item, option return } - logger.Info("Successfully deleted", logzap.Channels(logzap.Userlog)) + logger.Info("Item deleted", logzap.Channels(logzap.Userlog)) return err } @@ -233,7 +233,7 @@ func (m *loggingMiddleware) Publish(ctx context.Context, item *items.Item, optio return } - logger.Info("Successfully published", logzap.Channels(logzap.Userlog)) + logger.Info("Item published", logzap.Channels(logzap.Userlog)) return err } @@ -250,7 +250,7 @@ func (m *loggingMiddleware) Unarchive(ctx context.Context, item *items.Item, opt return } - logger.Info("Successfully unarchived", logzap.Channels(logzap.Userlog)) + logger.Info("Item unarchived", logzap.Channels(logzap.Userlog)) return err } @@ -267,7 +267,7 @@ func (m *loggingMiddleware) Undelete(ctx context.Context, item *items.Item, opti return } - logger.Info("Successfully undeleted", logzap.Channels(logzap.Userlog)) + logger.Info("Item undeleted", logzap.Channels(logzap.Userlog)) return err } @@ -284,7 +284,7 @@ func (m *loggingMiddleware) Unpublish(ctx context.Context, item *items.Item, opt return } - logger.Info("Successfully unpublished", logzap.Channels(logzap.Userlog)) + logger.Info("Item unpublished", logzap.Channels(logzap.Userlog)) return err } @@ -301,6 +301,6 @@ func (m *loggingMiddleware) Update(ctx context.Context, item *items.Item, option return } - logger.Info("Successfully updated", logzap.Channels(logzap.Userlog)) + logger.Info("Item updated", logzap.Channels(logzap.Userlog)) return err }