diff --git a/pkg/environments/middleware/logging_middleware.go b/pkg/environments/middleware/logging_middleware.go index 63ad24294d31248a2382873646ff98c4e69e1696..940d29535e4eb9e6133b01748a434cd029397190 100644 --- a/pkg/environments/middleware/logging_middleware.go +++ b/pkg/environments/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/environments" @@ -121,12 +122,11 @@ func (m *loggingMiddleware) RemoveAlias(ctx context.Context, spaceId string, env err = m.next.RemoveAlias(ctx, spaceId, envId, alias) if err != nil { - logger.Error("Failed to remove alias", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + logger.Error(fmt.Sprintf("Failed to remove alias '%s'", alias), zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) return } - logger.Info("Environment alias removed", logzap.Channels(logzap.Userlog)) - + logger.Info(fmt.Sprintf("Environment alias '%s' removed", alias), logzap.Channels(logzap.Userlog)) return err } @@ -139,12 +139,11 @@ func (m *loggingMiddleware) SetAlias(ctx context.Context, spaceId string, envId err = m.next.SetAlias(ctx, spaceId, envId, alias) if err != nil { - logger.Error("Failed to set alias", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + logger.Error(fmt.Sprintf("Failed to set alias '%s'", alias), zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) return } - logger.Info("Environment alias was set", logzap.Channels(logzap.Userlog)) - + logger.Info(fmt.Sprintf("Environment alias '%s' set", alias), logzap.Channels(logzap.Userlog)) return err } @@ -162,6 +161,5 @@ func (m *loggingMiddleware) Update(ctx context.Context, env *environments.Enviro } logger.Info("Environment updated", logzap.Channels(logzap.Userlog)) - return err } diff --git a/pkg/members/middleware/logging_middleware.go b/pkg/members/middleware/logging_middleware.go index 960530e5aa343dd4f62abca20a39c62da8047b36..9b8a3d99a20d4b30fa506f7b714d0b316d37998b 100644 --- a/pkg/members/middleware/logging_middleware.go +++ b/pkg/members/middleware/logging_middleware.go @@ -33,11 +33,11 @@ func (m *loggingMiddleware) Set(ctx context.Context, orgId, userId string, role err = m.next.Set(ctx, orgId, userId, role) if err != nil { - logger.Error("Failed to set", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), zap.String("UserID", userId), zap.String("Role", fmt.Sprintf("%s", role))) + logger.Error(fmt.Sprintf("User '%s' assigned to role '%s'", userId, role), zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) return } - logger.Info("Member set", logzap.Channels(logzap.Userlog), zap.String("UserID", userId), zap.String("Role", fmt.Sprintf("%s", role))) + logger.Info(fmt.Sprintf("Failed to assign user '%s' to role '%s'", userId, role), logzap.Channels(logzap.Userlog)) return err } @@ -66,11 +66,11 @@ func (m *loggingMiddleware) Remove(ctx context.Context, orgId, userId string) (e err = m.next.Remove(ctx, orgId, userId) if err != nil { - logger.Error("Failed to remove", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + logger.Error(fmt.Sprintf("Failed to remove user '%s'", userId), zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) return } - logger.Info("Member removed", logzap.Channels(logzap.Userlog)) + logger.Info(fmt.Sprintf("User '%s' removed", userId), logzap.Channels(logzap.Userlog)) return err } @@ -84,7 +84,7 @@ func (m *loggingMiddleware) RemoveAll(ctx context.Context, orgId string) (err er err = m.next.RemoveAll(ctx, orgId) if err != nil { - logger.Error("Failed to remove all", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + logger.Error("Failed to remove all members", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) return }