Merge branch 'feature/PRXS-2033-2229-LoggingLocales' into 'feature/PRXS-2033-LoggingToServices'

Добавлено логирование событий сервиса Locales

See merge request perxis/perxis-go!194

pkg/locales/events.go

+package locales
+
+const (
+	EventCreate = "locales.create"
+	EventDelete = "locales.delete"
+)

pkg/locales/middleware/logging_middleware.go

+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
+}

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