From fde07ee8a7f3a974e897a47187a94635ea3d95c3 Mon Sep 17 00:00:00 2001
From: "a.petraki" <a.petraki@perx.ru>
Date: Sun, 7 Apr 2024 23:53:03 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=BE=D0=B3=D0=B3=D0=B8=D1=80=D0=BE?=
=?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B5=D1=80=D0=B2=D0=B8?=
=?UTF-8?q?=D1=81=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/clients/events.go | 10 +++++-----
pkg/collaborators/events.go | 7 ++-----
pkg/collaborators/middleware/logging_middleware.go | 10 +++++-----
pkg/invitations/middleware/logging_middleware.go | 4 ++--
pkg/locales/middleware/logging_middleware.go | 7 ++-----
5 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/pkg/clients/events.go b/pkg/clients/events.go
index 5bba0b6f..98ece5ff 100644
--- a/pkg/clients/events.go
+++ b/pkg/clients/events.go
@@ -1,9 +1,9 @@
package clients
const (
- EventCreate = "client.create"
- EventUpdate = "client.update"
- EventDelete = "client.delete"
- EventEnable = "client.enable"
- EventDisable = "client.disable"
+ EventCreate = "clients.create"
+ EventUpdate = "clients.update"
+ EventDelete = "clients.delete"
+ EventEnable = "clients.enable"
+ EventDisable = "clients.disable"
)
diff --git a/pkg/collaborators/events.go b/pkg/collaborators/events.go
index a9a46eb0..9f4a8b7c 100644
--- a/pkg/collaborators/events.go
+++ b/pkg/collaborators/events.go
@@ -1,9 +1,6 @@
package collaborators
const (
- EventSet = "collaborators.set"
- EventGet = "collaborators.get"
- EventRemove = "collaborators.remove"
- EventListCollaborators = "collaborators.list_collaborators"
- EventListSpaces = "collaborators.list_Spaces"
+ EventSet = "collaborators.set"
+ EventRemove = "collaborators.remove"
)
diff --git a/pkg/collaborators/middleware/logging_middleware.go b/pkg/collaborators/middleware/logging_middleware.go
index 7bbdca3e..645750f0 100644
--- a/pkg/collaborators/middleware/logging_middleware.go
+++ b/pkg/collaborators/middleware/logging_middleware.go
@@ -33,11 +33,11 @@ func (m *loggingMiddleware) Set(ctx context.Context, spaceId, subject, role stri
err = m.next.Set(ctx, spaceId, subject, role)
if err != nil {
- logger.Error(fmt.Sprintf("Failed to set user '%s' as a member with role '%s'", subject, role), zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ logger.Error(fmt.Sprintf("Failed to set user '%s' as a collaborator with role '%s'", subject, role), zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
return
}
- logger.Info(fmt.Sprintf("User '%s' assigned to role '%s'", subject, spaceId), logzap.Channels(logzap.Userlog))
+ logger.Info(fmt.Sprintf("User '%s' assigned to role '%s'", subject, role), logzap.Channels(logzap.Userlog))
return err
}
@@ -49,7 +49,7 @@ func (m *loggingMiddleware) Get(ctx context.Context, spaceId, subject string) (r
role, err = m.next.Get(ctx, spaceId, subject)
if err != nil {
- logger.Error("Failed to get", zap.Error(err))
+ logger.Error(fmt.Sprintf("Failed to get role for collaborator %s", subject), zap.Error(err))
return
}
@@ -65,11 +65,11 @@ func (m *loggingMiddleware) Remove(ctx context.Context, spaceId, subject string)
err = m.next.Remove(ctx, spaceId, subject)
if err != nil {
- logger.Error(fmt.Sprintf("Failed to remove user '%s' from space '%s'", subject, spaceId), zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ logger.Error(fmt.Sprintf("Failed to remove user '%s' from space", subject), zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
return
}
- logger.Info(fmt.Sprintf("User '%s' removed from space '%s'", subject, spaceId), logzap.Channels(logzap.Userlog))
+ logger.Info(fmt.Sprintf("User '%s' removed from space", subject), logzap.Channels(logzap.Userlog))
return err
}
diff --git a/pkg/invitations/middleware/logging_middleware.go b/pkg/invitations/middleware/logging_middleware.go
index ab2354aa..f32fa01b 100644
--- a/pkg/invitations/middleware/logging_middleware.go
+++ b/pkg/invitations/middleware/logging_middleware.go
@@ -35,11 +35,11 @@ func (m *loggingMiddleware) Create(ctx context.Context, invitation *invitations.
created, err = m.next.Create(ctx, invitation)
if err != nil {
- logger.Error(fmt.Sprintf("Failed to create invitation '%s'", invitation.ID), zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ logger.Error("Failed to create invitation", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
return
}
- logger.Info(fmt.Sprintf("User create invitation '%s'", created.ID), logzap.Channels(logzap.Userlog))
+ logger.Info(fmt.Sprintf("Created invitation '%s'", created.ID), logzap.Channels(logzap.Userlog))
return created, err
}
diff --git a/pkg/locales/middleware/logging_middleware.go b/pkg/locales/middleware/logging_middleware.go
index 78a9356f..8244557a 100644
--- a/pkg/locales/middleware/logging_middleware.go
+++ b/pkg/locales/middleware/logging_middleware.go
@@ -27,17 +27,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, locale *locales.Locale)
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))
+ logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(locale))
return
}
- logger.Info("Locale created", logzap.Channels(logzap.Userlog))
-
+ logger.Info("Locale created", logzap.Channels(logzap.Userlog), logzap.Object(created))
return created, err
}
@@ -69,6 +67,5 @@ func (m *loggingMiddleware) Delete(ctx context.Context, spaceId, localeId string
}
logger.Info("Locale deleted", logzap.Channels(logzap.Userlog))
-
return err
}
--
GitLab