From ddce9c38ba12a93214624259e97c7722c4b2fdad Mon Sep 17 00:00:00 2001 From: Alex Petraky <petraky@perx.ru> Date: Tue, 2 Apr 2024 12:38:22 +0000 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BB=D0=BE=D0=B3=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B9?= =?UTF-8?q?=20=D1=81=D0=B5=D1=80=D0=B2=D0=B8=D1=81=D0=B0=20Locales?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/locales/events.go | 6 ++ pkg/locales/middleware/logging_middleware.go | 74 ++++++++++++++++++++ pkg/locales/middleware/middleware.go | 2 +- 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 pkg/locales/events.go create mode 100644 pkg/locales/middleware/logging_middleware.go diff --git a/pkg/locales/events.go b/pkg/locales/events.go new file mode 100644 index 00000000..b7c4c3dc --- /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 00000000..78a9356f --- /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 2598e397..28c61113 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 -- GitLab