From 3383c9bf0ad80ee276737adc72d2a6533f5d5afb Mon Sep 17 00:00:00 2001
From: "a.petraki" <a.petraki@perx.ru>
Date: Thu, 4 Apr 2024 13:09:33 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?=
=?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=20=D0=BB=D0=BE=D0=B3=D0=B0=D1=85=20=D0=B4?=
=?UTF-8?q?=D0=BB=D1=8F=20=D1=81=D0=B5=D1=80=D0=B2=D0=B8=D1=81=D0=BE=D0=B2?=
=?UTF-8?q?=20Environments,Members?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/environments/middleware/logging_middleware.go | 12 +++++-------
pkg/members/middleware/logging_middleware.go | 10 +++++-----
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/pkg/environments/middleware/logging_middleware.go b/pkg/environments/middleware/logging_middleware.go
index 63ad2429..940d2953 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 960530e5..9b8a3d99 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
}
--
GitLab