diff --git a/pkg/spaces/middleware/logging_middleware.go b/pkg/spaces/middleware/logging_middleware.go index d2afd8010fed5f667914a058de4c72259e0d4e17..877ee7e5a62cb0a4a081191b2497d04051771757 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 }