From c4c2cc2e954701f58dc3e0dc8c13f973865ff3a0 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Sat, 6 Apr 2024 21:38:33 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?=
=?UTF-8?q?=D1=80=D0=B8=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8?=
=?UTF-8?q?=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/clients/middleware/logging_middleware.go | 7 +++----
pkg/environments/middleware/logging_middleware.go | 5 ++---
pkg/organizations/middleware/logging_middleware.go | 6 +++---
pkg/roles/middleware/logging_middleware.go | 5 ++---
pkg/spaces/middleware/logging_middleware.go | 6 +++---
pkg/users/middleware/logging_middleware.go | 5 ++---
6 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/pkg/clients/middleware/logging_middleware.go b/pkg/clients/middleware/logging_middleware.go
index 8a9abafa..8cc5e384 100644
--- a/pkg/clients/middleware/logging_middleware.go
+++ b/pkg/clients/middleware/logging_middleware.go
@@ -25,18 +25,17 @@ func LoggingMiddleware(logger *zap.Logger) Middleware {
func (m *loggingMiddleware) Create(ctx context.Context, client *clients.Client) (created *clients.Client, err error) {
logger := m.logger.With(
- logzap.Caller(ctx),
+ logzap.Caller(ctx, logzap.WithSpace(client.SpaceID)),
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))
+ logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(client))
return
}
- logger.Info("Client created", logzap.Channels(logzap.Userlog))
+ logger.Info("Client created", logzap.Channels(logzap.Userlog), logzap.Object(created))
return created, err
}
diff --git a/pkg/environments/middleware/logging_middleware.go b/pkg/environments/middleware/logging_middleware.go
index 940d2953..71d2e5c6 100644
--- a/pkg/environments/middleware/logging_middleware.go
+++ b/pkg/environments/middleware/logging_middleware.go
@@ -29,16 +29,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, env *environments.Enviro
logger := m.logger.With(
logzap.Caller(ctx),
logzap.Event(environments.EventCreate),
- logzap.Object(env),
)
created, err = m.next.Create(ctx, env)
if err != nil {
- logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(env))
return
}
- logger.Info("Environment created", logzap.Channels(logzap.Userlog))
+ logger.Info("Environment created", logzap.Channels(logzap.Userlog), logzap.Object(created))
return created, err
}
diff --git a/pkg/organizations/middleware/logging_middleware.go b/pkg/organizations/middleware/logging_middleware.go
index c88108e9..bda7f54f 100644
--- a/pkg/organizations/middleware/logging_middleware.go
+++ b/pkg/organizations/middleware/logging_middleware.go
@@ -2,6 +2,7 @@ package middleware
import (
"context"
+
"git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/organizations"
@@ -28,16 +29,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, org *organizations.Organ
logger := m.logger.With(
logzap.Caller(ctx),
logzap.Event(organizations.EventCreate),
- logzap.Object(org),
)
created, err = m.next.Create(ctx, org)
if err != nil {
- logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(org))
return
}
- logger.Info("Organization created", logzap.Channels(logzap.Userlog))
+ logger.Info("Organization created", logzap.Channels(logzap.Userlog), logzap.Object(created))
return created, err
}
diff --git a/pkg/roles/middleware/logging_middleware.go b/pkg/roles/middleware/logging_middleware.go
index 5f564bff..9221265d 100644
--- a/pkg/roles/middleware/logging_middleware.go
+++ b/pkg/roles/middleware/logging_middleware.go
@@ -27,16 +27,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, role *roles.Role) (creat
logger := m.logger.With(
logzap.Caller(ctx),
logzap.Event(roles.EventCreate),
- logzap.Object(role),
)
created, err = m.next.Create(ctx, role)
if err != nil {
- logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(role))
return
}
- logger.Info("Role created", logzap.Channels(logzap.Userlog))
+ logger.Info("Role created", logzap.Channels(logzap.Userlog), logzap.Object(created))
return created, err
}
diff --git a/pkg/spaces/middleware/logging_middleware.go b/pkg/spaces/middleware/logging_middleware.go
index 5a7ef7c1..d2afd801 100644
--- a/pkg/spaces/middleware/logging_middleware.go
+++ b/pkg/spaces/middleware/logging_middleware.go
@@ -2,6 +2,7 @@ package middleware
import (
"context"
+
"git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
@@ -45,16 +46,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, space *spaces.Space) (cr
logger := m.logger.With(
logzap.Caller(ctx),
logzap.Event(spaces.EventCreate),
- logzap.Object(space),
)
created, err = m.next.Create(ctx, space)
if err != nil {
- logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(space))
return
}
- logger.Info("Space created", logzap.Channels(logzap.Userlog))
+ logger.Info("Space created", logzap.Channels(logzap.Userlog), logzap.Object(created))
return created, err
}
diff --git a/pkg/users/middleware/logging_middleware.go b/pkg/users/middleware/logging_middleware.go
index 5fb8f82a..3350d36d 100644
--- a/pkg/users/middleware/logging_middleware.go
+++ b/pkg/users/middleware/logging_middleware.go
@@ -28,16 +28,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, create *users.User) (use
logger := m.logger.With(
logzap.Caller(ctx),
logzap.Event(users.EventCreate),
- logzap.Object(user),
)
user, err = m.next.Create(ctx, create)
if err != nil {
- logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(user))
return
}
- logger.Info("User created", logzap.Channels(logzap.Userlog))
+ logger.Info("User created", logzap.Channels(logzap.Userlog), logzap.Object(user))
return user, err
}
--
GitLab