From f26dbe0d14f12238555fd617996bed873685acdb Mon Sep 17 00:00:00 2001
From: "a.petraki" <a.petraki@perx.ru>
Date: Thu, 11 Apr 2024 11:05:50 +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=BE=D0=B1=D1=8B=D1=82?=
=?UTF-8?q?=D0=B8=D1=8F=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?=
=?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D1=81=D1=82=D1=80=D0=B0=D0=BD=D1=81=D1=82?=
=?UTF-8?q?=D0=B2=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=BE=D0=B4?=
=?UTF-8?q?=D0=B8=D1=82=D1=81=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=B1?=
=?UTF-8?q?=D1=8A=D0=B5=D0=BA=D1=82=D0=B0=20=D0=BE=D1=80=D0=B3=D0=B0=D0=BD?=
=?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/spaces/middleware/logging_middleware.go | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/pkg/spaces/middleware/logging_middleware.go b/pkg/spaces/middleware/logging_middleware.go
index d2afd801..877ee7e5 100644
--- a/pkg/spaces/middleware/logging_middleware.go
+++ b/pkg/spaces/middleware/logging_middleware.go
@@ -2,6 +2,7 @@ package middleware
import (
"context"
+ "fmt"
"git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
@@ -60,19 +61,24 @@ func (m *loggingMiddleware) Create(ctx context.Context, space *spaces.Space) (cr
}
func (m *loggingMiddleware) Delete(ctx context.Context, spaceId string) (err error) {
+ space, err := m.Get(ctx, spaceId)
+ if err != nil {
+ return err
+ }
+
logger := m.logger.With(
logzap.Caller(ctx),
logzap.Event(spaces.EventDelete),
- logzap.Object(id.NewSpaceId(spaceId)),
+ logzap.Object(id.NewOrganizationId(space.OrgID)),
)
err = m.next.Delete(ctx, spaceId)
if err != nil {
- logger.Error("Failed to delete", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ logger.Error(fmt.Sprintf("Failed to delete space '%s'", spaceId), zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
return
}
- logger.Info("Space deleted", logzap.Channels(logzap.Userlog))
+ logger.Info(fmt.Sprintf("Space '%s' deleted", spaceId), logzap.Channels(logzap.Userlog))
return err
}
--
GitLab