From 8f616f2a877eb0c9febfa93ecdc4e9a6a5cfc306 Mon Sep 17 00:00:00 2001
From: Alex Petraky <petraky@perx.ru>
Date: Mon, 1 Apr 2024 13:29:16 +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=20Clients?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/clients/events.go | 9 ++
pkg/clients/middleware/logging_middleware.go | 146 +++++++++++++++++++
pkg/clients/middleware/middleware.go | 2 +-
3 files changed, 156 insertions(+), 1 deletion(-)
create mode 100644 pkg/clients/events.go
create mode 100644 pkg/clients/middleware/logging_middleware.go
diff --git a/pkg/clients/events.go b/pkg/clients/events.go
new file mode 100644
index 00000000..5bba0b6f
--- /dev/null
+++ b/pkg/clients/events.go
@@ -0,0 +1,9 @@
+package clients
+
+const (
+ EventCreate = "client.create"
+ EventUpdate = "client.update"
+ EventDelete = "client.delete"
+ EventEnable = "client.enable"
+ EventDisable = "client.disable"
+)
diff --git a/pkg/clients/middleware/logging_middleware.go b/pkg/clients/middleware/logging_middleware.go
new file mode 100644
index 00000000..c8ce011a
--- /dev/null
+++ b/pkg/clients/middleware/logging_middleware.go
@@ -0,0 +1,146 @@
+package middleware
+
+import (
+ "context"
+
+ "git.perx.ru/perxis/perxis-go/id"
+ "git.perx.ru/perxis/perxis-go/pkg/clients"
+ logzap "git.perx.ru/perxis/perxis-go/zap"
+ "go.uber.org/zap"
+)
+
+type loggingMiddleware struct {
+ logger *zap.Logger
+ next clients.Clients
+}
+
+func LoggingMiddleware(logger *zap.Logger) Middleware {
+ return func(next clients.Clients) clients.Clients {
+ return &loggingMiddleware{
+ next: next,
+ logger: logger.With(logzap.Component("Clients")),
+ }
+ }
+}
+
+func (m *loggingMiddleware) Create(ctx context.Context, client *clients.Client) (created *clients.Client, err error) {
+ logger := m.logger.With(
+ logzap.CallerFromContext(ctx, ""),
+ logzap.Event(clients.EventCreate),
+ logzap.Object(client),
+ )
+
+ created, err = m.next.Create(ctx, client)
+ if err != nil {
+ logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ return
+ }
+
+ logger.Info("Client created", logzap.Channels(logzap.Userlog))
+
+ return created, err
+}
+
+func (m *loggingMiddleware) Get(ctx context.Context, spaceId, clientId string) (client *clients.Client, err error) {
+ logger := m.logger.With(
+ logzap.CallerFromContext(ctx, ""),
+ logzap.Object(id.NewClientId(spaceId, clientId)),
+ )
+
+ client, err = m.next.Get(ctx, spaceId, clientId)
+ if err != nil {
+ logger.Error("Failed to get", zap.Error(err))
+ return
+ }
+
+ return client, err
+}
+
+func (m *loggingMiddleware) GetBy(ctx context.Context, spaceId string, params *clients.GetByParams) (client *clients.Client, err error) {
+ logger := m.logger.With(
+ logzap.CallerFromContext(ctx, ""),
+ )
+
+ client, err = m.next.GetBy(ctx, spaceId, params)
+ if err != nil {
+ logger.Error("Failed to get by", zap.Error(err))
+ return
+ }
+
+ return client, err
+}
+
+func (m *loggingMiddleware) List(ctx context.Context, spaceId string) (clients []*clients.Client, err error) {
+ logger := m.logger.With(
+ logzap.CallerFromContext(ctx, ""),
+ )
+
+ clients, err = m.next.List(ctx, spaceId)
+ if err != nil {
+ logger.Error("Failed to list", zap.Error(err))
+ return
+ }
+
+ return clients, err
+}
+
+func (m *loggingMiddleware) Update(ctx context.Context, client *clients.Client) (err error) {
+ logger := m.logger.With(
+ logzap.CallerFromContext(ctx, ""),
+ logzap.Event(clients.EventUpdate),
+ logzap.Object(client),
+ )
+
+ err = m.next.Update(ctx, client)
+ if err != nil {
+ logger.Error("Failed to update", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ return
+ }
+
+ logger.Info("Client updated", logzap.Channels(logzap.Userlog))
+
+ return err
+}
+
+func (m *loggingMiddleware) Delete(ctx context.Context, spaceId, clientId string) (err error) {
+ logger := m.logger.With(
+ logzap.CallerFromContext(ctx, ""),
+ logzap.Event(clients.EventDelete),
+ logzap.Object(id.NewClientId(spaceId, clientId)),
+ )
+
+ err = m.next.Delete(ctx, spaceId, clientId)
+ if err != nil {
+ logger.Error("Failed to delete", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ return
+ }
+
+ logger.Info("Client deleted", logzap.Channels(logzap.Userlog))
+
+ return err
+}
+
+func (m *loggingMiddleware) Enable(ctx context.Context, spaceId, clientId string, enable bool) (err error) {
+ event := clients.EventDisable
+ logMsg := "disable"
+
+ if enable {
+ event = clients.EventEnable
+ logMsg = "enable"
+ }
+
+ logger := m.logger.With(
+ logzap.CallerFromContext(ctx, ""),
+ logzap.Event(event),
+ logzap.Object(id.NewClientId(spaceId, clientId)),
+ )
+
+ err = m.next.Enable(ctx, spaceId, clientId, enable)
+ if err != nil {
+ logger.Error("Failed to "+logMsg, zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ return
+ }
+
+ logger.Info("Client "+logMsg+"d", logzap.Channels(logzap.Userlog))
+ return err
+}
diff --git a/pkg/clients/middleware/middleware.go b/pkg/clients/middleware/middleware.go
index 0c72c166..945ae1f2 100644
--- a/pkg/clients/middleware/middleware.go
+++ b/pkg/clients/middleware/middleware.go
@@ -21,7 +21,7 @@ func WithLog(s clients.Clients, logger *zap.Logger, log_access bool) clients.Cli
if log_access {
s = AccessLoggingMiddleware(logger)(s)
}
- s = ErrorLoggingMiddleware(logger)(s)
+ s = LoggingMiddleware(logger)(s)
s = RecoveringMiddleware(logger)(s)
return s
--
GitLab