Skip to content
Snippets Groups Projects
Commit e6509d32 authored by Pavel Antonov's avatar Pavel Antonov :asterisk:
Browse files

Merge branch 'feature/PRXS-951-2074-ChangeLogText' into 'master'

Изменен текст логов при работе с записями и коллекциями

See merge request perxis/perxis-go!179
parents ee18fe59 f6e94e08
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ func TestExample(t *testing.T) { ...@@ -27,7 +27,7 @@ func TestExample(t *testing.T) {
wantEntries := []*logs.Entry{ wantEntries := []*logs.Entry{
{ {
Level: logs.Level(zapcore.InfoLevel), Level: logs.Level(zapcore.InfoLevel),
Message: "Successfully created", Message: "Item created",
Component: "Items", Component: "Items",
Event: items.EventCreateItem, Event: items.EventCreateItem,
ObjectID: id.MustObjectId(item), ObjectID: id.MustObjectId(item),
...@@ -36,7 +36,7 @@ func TestExample(t *testing.T) { ...@@ -36,7 +36,7 @@ func TestExample(t *testing.T) {
}, },
{ {
Level: logs.Level(zapcore.WarnLevel), Level: logs.Level(zapcore.WarnLevel),
Message: "Successfully updated", Message: "Item updated",
Component: "Items", Component: "Items",
Event: items.EventUpdateItem, Event: items.EventUpdateItem,
ObjectID: id.MustObjectId(item), ObjectID: id.MustObjectId(item),
...@@ -74,7 +74,7 @@ func TestExample(t *testing.T) { ...@@ -74,7 +74,7 @@ func TestExample(t *testing.T) {
ctx := auth.WithPrincipal(context.Background(), factory.User("74d90aaf")) ctx := auth.WithPrincipal(context.Background(), factory.User("74d90aaf"))
// Отправка лога при создании item // Отправка лога при создании item
logger.Info("Successfully created", logger.Info("Item created",
logzap.Event(items.EventCreateItem), logzap.Event(items.EventCreateItem),
logzap.Object(item), logzap.Object(item),
logzap.CallerFromContext(ctx), logzap.CallerFromContext(ctx),
...@@ -82,7 +82,7 @@ func TestExample(t *testing.T) { ...@@ -82,7 +82,7 @@ func TestExample(t *testing.T) {
) )
// Отправка лога при обновлении item // Отправка лога при обновлении item
logger.Warn("Successfully updated", logger.Warn("Item updated",
logzap.Event(items.EventUpdateItem), logzap.Event(items.EventUpdateItem),
logzap.Object(item), logzap.Object(item),
logzap.CallerFromContext(ctx), logzap.CallerFromContext(ctx),
......
...@@ -36,7 +36,7 @@ func (m *loggingMiddleware) Create(ctx context.Context, collection *collections. ...@@ -36,7 +36,7 @@ func (m *loggingMiddleware) Create(ctx context.Context, collection *collections.
return 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 return created, err
} }
...@@ -53,7 +53,7 @@ func (m *loggingMiddleware) Delete(ctx context.Context, spaceId string, envId st ...@@ -53,7 +53,7 @@ func (m *loggingMiddleware) Delete(ctx context.Context, spaceId string, envId st
return return
} }
logger.Info("Successfully deleted", logzap.Channels(logzap.Userlog)) logger.Info("Collection deleted", logzap.Channels(logzap.Userlog))
return err return err
} }
...@@ -98,7 +98,7 @@ func (m *loggingMiddleware) SetSchema(ctx context.Context, spaceId string, envId ...@@ -98,7 +98,7 @@ func (m *loggingMiddleware) SetSchema(ctx context.Context, spaceId string, envId
return return
} }
logger.Info("Successfully set schema", logzap.Channels(logzap.Userlog)) logger.Info("Set collection's schema", logzap.Channels(logzap.Userlog))
return err return err
} }
...@@ -113,7 +113,7 @@ func (m *loggingMiddleware) SetState(ctx context.Context, spaceId string, envId ...@@ -113,7 +113,7 @@ func (m *loggingMiddleware) SetState(ctx context.Context, spaceId string, envId
return return
} }
logger.Info("Successfully set state", logzap.Channels(logzap.Userlog)) logger.Info("Set collection's state", logzap.Channels(logzap.Userlog))
return err return err
} }
...@@ -130,6 +130,6 @@ func (m *loggingMiddleware) Update(ctx context.Context, coll *collections.Collec ...@@ -130,6 +130,6 @@ func (m *loggingMiddleware) Update(ctx context.Context, coll *collections.Collec
return return
} }
logger.Info("Successfully updated", logzap.Channels(logzap.Userlog)) logger.Info("Collection updated", logzap.Channels(logzap.Userlog))
return err return err
} }
...@@ -65,7 +65,7 @@ func (m *loggingMiddleware) Archive(ctx context.Context, item *items.Item, optio ...@@ -65,7 +65,7 @@ func (m *loggingMiddleware) Archive(ctx context.Context, item *items.Item, optio
return return
} }
logger.Info("Successfully archived", logzap.Channels(logzap.Userlog)) logger.Info("Item archived", logzap.Channels(logzap.Userlog))
return err return err
} }
...@@ -81,7 +81,7 @@ func (m *loggingMiddleware) Create(ctx context.Context, item *items.Item, opts . ...@@ -81,7 +81,7 @@ func (m *loggingMiddleware) Create(ctx context.Context, item *items.Item, opts .
return 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 return created, err
} }
...@@ -98,7 +98,7 @@ func (m *loggingMiddleware) Delete(ctx context.Context, item *items.Item, option ...@@ -98,7 +98,7 @@ func (m *loggingMiddleware) Delete(ctx context.Context, item *items.Item, option
return return
} }
logger.Info("Successfully deleted", logzap.Channels(logzap.Userlog)) logger.Info("Item deleted", logzap.Channels(logzap.Userlog))
return err return err
} }
...@@ -233,7 +233,7 @@ func (m *loggingMiddleware) Publish(ctx context.Context, item *items.Item, optio ...@@ -233,7 +233,7 @@ func (m *loggingMiddleware) Publish(ctx context.Context, item *items.Item, optio
return return
} }
logger.Info("Successfully published", logzap.Channels(logzap.Userlog)) logger.Info("Item published", logzap.Channels(logzap.Userlog))
return err return err
} }
...@@ -250,7 +250,7 @@ func (m *loggingMiddleware) Unarchive(ctx context.Context, item *items.Item, opt ...@@ -250,7 +250,7 @@ func (m *loggingMiddleware) Unarchive(ctx context.Context, item *items.Item, opt
return return
} }
logger.Info("Successfully unarchived", logzap.Channels(logzap.Userlog)) logger.Info("Item unarchived", logzap.Channels(logzap.Userlog))
return err return err
} }
...@@ -267,7 +267,7 @@ func (m *loggingMiddleware) Undelete(ctx context.Context, item *items.Item, opti ...@@ -267,7 +267,7 @@ func (m *loggingMiddleware) Undelete(ctx context.Context, item *items.Item, opti
return return
} }
logger.Info("Successfully undeleted", logzap.Channels(logzap.Userlog)) logger.Info("Item undeleted", logzap.Channels(logzap.Userlog))
return err return err
} }
...@@ -284,7 +284,7 @@ func (m *loggingMiddleware) Unpublish(ctx context.Context, item *items.Item, opt ...@@ -284,7 +284,7 @@ func (m *loggingMiddleware) Unpublish(ctx context.Context, item *items.Item, opt
return return
} }
logger.Info("Successfully unpublished", logzap.Channels(logzap.Userlog)) logger.Info("Item unpublished", logzap.Channels(logzap.Userlog))
return err return err
} }
...@@ -301,6 +301,6 @@ func (m *loggingMiddleware) Update(ctx context.Context, item *items.Item, option ...@@ -301,6 +301,6 @@ func (m *loggingMiddleware) Update(ctx context.Context, item *items.Item, option
return return
} }
logger.Info("Successfully updated", logzap.Channels(logzap.Userlog)) logger.Info("Item updated", logzap.Channels(logzap.Userlog))
return err return err
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment