Skip to content
Snippets Groups Projects
Commit 7d2c8fb7 authored by Pavel Antonov's avatar Pavel Antonov :asterisk:
Browse files

Merge branch 'feature/PRXS-2033-LoggingToServices' into 'master'

Логгирование события удаления пространства производится для объекта организации

See merge request perxis/perxis-go!219
parents d53f3569 f26dbe0d
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,7 @@ package middleware ...@@ -2,6 +2,7 @@ package middleware
import ( import (
"context" "context"
"fmt"
"git.perx.ru/perxis/perxis-go/id" "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/spaces" "git.perx.ru/perxis/perxis-go/pkg/spaces"
...@@ -60,19 +61,24 @@ func (m *loggingMiddleware) Create(ctx context.Context, space *spaces.Space) (cr ...@@ -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) { 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( logger := m.logger.With(
logzap.Caller(ctx), logzap.Caller(ctx),
logzap.Event(spaces.EventDelete), logzap.Event(spaces.EventDelete),
logzap.Object(id.NewSpaceId(spaceId)), logzap.Object(id.NewOrganizationId(space.OrgID)),
) )
err = m.next.Delete(ctx, spaceId) err = m.next.Delete(ctx, spaceId)
if err != nil { 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 return
} }
logger.Info("Space deleted", logzap.Channels(logzap.Userlog)) logger.Info(fmt.Sprintf("Space '%s' deleted", spaceId), logzap.Channels(logzap.Userlog))
return err return err
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment