diff --git a/pkg/locales/events.go b/pkg/locales/events.go new file mode 100644 index 0000000000000000000000000000000000000000..b7c4c3dc23e7993196ccc773d35e633a5e29ff27 --- /dev/null +++ b/pkg/locales/events.go @@ -0,0 +1,6 @@ +package locales + +const ( + EventCreate = "locales.create" + EventDelete = "locales.delete" +) diff --git a/pkg/locales/middleware/logging_middleware.go b/pkg/locales/middleware/logging_middleware.go new file mode 100644 index 0000000000000000000000000000000000000000..78a9356ffc367c0dad1c7257538a3356ecf3b2b4 --- /dev/null +++ b/pkg/locales/middleware/logging_middleware.go @@ -0,0 +1,74 @@ +package middleware + +import ( + "context" + + "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/pkg/locales" + logzap "git.perx.ru/perxis/perxis-go/zap" + "go.uber.org/zap" +) + +type loggingMiddleware struct { + logger *zap.Logger + next locales.Locales +} + +func LoggingMiddleware(logger *zap.Logger) Middleware { + return func(next locales.Locales) locales.Locales { + return &loggingMiddleware{ + next: next, + logger: logger.With(logzap.Component("Locales")), + } + } +} + +func (m *loggingMiddleware) Create(ctx context.Context, locale *locales.Locale) (created *locales.Locale, err error) { + logger := m.logger.With( + logzap.Caller(ctx), + logzap.Event(locales.EventCreate), + logzap.Object(locale), + ) + + created, err = m.next.Create(ctx, locale) + if err != nil { + logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + return + } + + logger.Info("Locale created", logzap.Channels(logzap.Userlog)) + + return created, err +} + +func (m *loggingMiddleware) List(ctx context.Context, spaceId string) (locales []*locales.Locale, err error) { + logger := m.logger.With( + logzap.Caller(ctx), + ) + + locales, err = m.next.List(ctx, spaceId) + if err != nil { + logger.Error("Failed to list", zap.Error(err)) + return + } + + return locales, err +} + +func (m *loggingMiddleware) Delete(ctx context.Context, spaceId, localeId string) (err error) { + logger := m.logger.With( + logzap.Caller(ctx), + logzap.Event(locales.EventDelete), + logzap.Object(id.NewLocaleId(spaceId, localeId)), + ) + + err = m.next.Delete(ctx, spaceId, localeId) + if err != nil { + logger.Error("Failed to delete", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + return + } + + logger.Info("Locale deleted", logzap.Channels(logzap.Userlog)) + + return err +} diff --git a/pkg/locales/middleware/middleware.go b/pkg/locales/middleware/middleware.go index 2598e397afafb552c16be249cfcf1ed62149339b..28c61113902b15acf844d8a6251f0369159128a0 100644 --- a/pkg/locales/middleware/middleware.go +++ b/pkg/locales/middleware/middleware.go @@ -21,7 +21,7 @@ func WithLog(s locales.Locales, logger *zap.Logger, log_access bool) locales.Loc if log_access { s = AccessLoggingMiddleware(logger)(s) } - s = ErrorLoggingMiddleware(logger)(s) + s = LoggingMiddleware(logger)(s) s = RecoveringMiddleware(logger)(s) return s