Skip to content
Snippets Groups Projects
Commit 3383c9bf authored by Alena Petraki's avatar Alena Petraki :nail_care_tone1:
Browse files

Исправлены сообщения в логах для сервисов Environments,Members

parent 64d101ed
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/environments" "git.perx.ru/perxis/perxis-go/pkg/environments"
...@@ -121,12 +122,11 @@ func (m *loggingMiddleware) RemoveAlias(ctx context.Context, spaceId string, env ...@@ -121,12 +122,11 @@ func (m *loggingMiddleware) RemoveAlias(ctx context.Context, spaceId string, env
err = m.next.RemoveAlias(ctx, spaceId, envId, alias) err = m.next.RemoveAlias(ctx, spaceId, envId, alias)
if err != nil { 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 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 return err
} }
...@@ -139,12 +139,11 @@ func (m *loggingMiddleware) SetAlias(ctx context.Context, spaceId string, envId ...@@ -139,12 +139,11 @@ func (m *loggingMiddleware) SetAlias(ctx context.Context, spaceId string, envId
err = m.next.SetAlias(ctx, spaceId, envId, alias) err = m.next.SetAlias(ctx, spaceId, envId, alias)
if err != nil { 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 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 return err
} }
...@@ -162,6 +161,5 @@ func (m *loggingMiddleware) Update(ctx context.Context, env *environments.Enviro ...@@ -162,6 +161,5 @@ func (m *loggingMiddleware) Update(ctx context.Context, env *environments.Enviro
} }
logger.Info("Environment updated", logzap.Channels(logzap.Userlog)) logger.Info("Environment updated", logzap.Channels(logzap.Userlog))
return err return err
} }
...@@ -33,11 +33,11 @@ func (m *loggingMiddleware) Set(ctx context.Context, orgId, userId string, role ...@@ -33,11 +33,11 @@ func (m *loggingMiddleware) Set(ctx context.Context, orgId, userId string, role
err = m.next.Set(ctx, orgId, userId, role) err = m.next.Set(ctx, orgId, userId, role)
if err != nil { 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 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 return err
} }
...@@ -66,11 +66,11 @@ func (m *loggingMiddleware) Remove(ctx context.Context, orgId, userId string) (e ...@@ -66,11 +66,11 @@ func (m *loggingMiddleware) Remove(ctx context.Context, orgId, userId string) (e
err = m.next.Remove(ctx, orgId, userId) err = m.next.Remove(ctx, orgId, userId)
if err != nil { 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 return
} }
logger.Info("Member removed", logzap.Channels(logzap.Userlog)) logger.Info(fmt.Sprintf("User '%s' removed", userId), logzap.Channels(logzap.Userlog))
return err return err
} }
...@@ -84,7 +84,7 @@ func (m *loggingMiddleware) RemoveAll(ctx context.Context, orgId string) (err er ...@@ -84,7 +84,7 @@ func (m *loggingMiddleware) RemoveAll(ctx context.Context, orgId string) (err er
err = m.next.RemoveAll(ctx, orgId) err = m.next.RemoveAll(ctx, orgId)
if err != nil { 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 return
} }
......
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