diff --git a/pkg/clients/events.go b/pkg/clients/events.go index 5bba0b6f8d9dcb35f3dd6446a209735dcc57bf60..98ece5ff8a62e11e14b3c23e873feafe3e1fcc38 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 a9a46eb0ac1b8b98cdadbb3ab8b721154c03c838..9f4a8b7c2493f2b65a690f675f5a27a7eb344533 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 7bbdca3e1414f03c23838280e25aaec9425877bb..645750f0ff7244275a70eaac24e98977d9702e0d 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 ab2354aa65d93f26ff0aabc1781a34fd37ca1112..f32fa01b32887a2ced9b2a702d9e8434e1fef3de 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 78a9356ffc367c0dad1c7257538a3356ecf3b2b4..8244557a64d79f0ad57659a5708979e48f209693 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 }