Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
perxis-go
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Package registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
perxis
perxis-go
Commits
084b1b3d
Commit
084b1b3d
authored
1 year ago
by
ko_oler
Browse files
Options
Downloads
Patches
Plain Diff
CallerFromContext -> Caller
parent
505d6f38
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
pkg/clients/middleware/logging_middleware.go
+7
-7
7 additions, 7 deletions
pkg/clients/middleware/logging_middleware.go
pkg/environments/middleware/logging_middleware.go
+9
-8
9 additions, 8 deletions
pkg/environments/middleware/logging_middleware.go
with
16 additions
and
15 deletions
pkg/clients/middleware/logging_middleware.go
+
7
−
7
View file @
084b1b3d
...
@@ -25,7 +25,7 @@ func LoggingMiddleware(logger *zap.Logger) Middleware {
...
@@ -25,7 +25,7 @@ func LoggingMiddleware(logger *zap.Logger) Middleware {
func
(
m
*
loggingMiddleware
)
Create
(
ctx
context
.
Context
,
client
*
clients
.
Client
)
(
created
*
clients
.
Client
,
err
error
)
{
func
(
m
*
loggingMiddleware
)
Create
(
ctx
context
.
Context
,
client
*
clients
.
Client
)
(
created
*
clients
.
Client
,
err
error
)
{
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
logzap
.
Event
(
clients
.
EventCreate
),
logzap
.
Event
(
clients
.
EventCreate
),
logzap
.
Object
(
client
),
logzap
.
Object
(
client
),
)
)
...
@@ -43,7 +43,7 @@ func (m *loggingMiddleware) Create(ctx context.Context, client *clients.Client)
...
@@ -43,7 +43,7 @@ func (m *loggingMiddleware) Create(ctx context.Context, client *clients.Client)
func
(
m
*
loggingMiddleware
)
Get
(
ctx
context
.
Context
,
spaceId
,
clientId
string
)
(
client
*
clients
.
Client
,
err
error
)
{
func
(
m
*
loggingMiddleware
)
Get
(
ctx
context
.
Context
,
spaceId
,
clientId
string
)
(
client
*
clients
.
Client
,
err
error
)
{
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
logzap
.
Object
(
id
.
NewClientId
(
spaceId
,
clientId
)),
logzap
.
Object
(
id
.
NewClientId
(
spaceId
,
clientId
)),
)
)
...
@@ -58,7 +58,7 @@ func (m *loggingMiddleware) Get(ctx context.Context, spaceId, clientId string) (
...
@@ -58,7 +58,7 @@ func (m *loggingMiddleware) Get(ctx context.Context, spaceId, clientId string) (
func
(
m
*
loggingMiddleware
)
GetBy
(
ctx
context
.
Context
,
spaceId
string
,
params
*
clients
.
GetByParams
)
(
client
*
clients
.
Client
,
err
error
)
{
func
(
m
*
loggingMiddleware
)
GetBy
(
ctx
context
.
Context
,
spaceId
string
,
params
*
clients
.
GetByParams
)
(
client
*
clients
.
Client
,
err
error
)
{
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
)
)
client
,
err
=
m
.
next
.
GetBy
(
ctx
,
spaceId
,
params
)
client
,
err
=
m
.
next
.
GetBy
(
ctx
,
spaceId
,
params
)
...
@@ -72,7 +72,7 @@ func (m *loggingMiddleware) GetBy(ctx context.Context, spaceId string, params *c
...
@@ -72,7 +72,7 @@ func (m *loggingMiddleware) GetBy(ctx context.Context, spaceId string, params *c
func
(
m
*
loggingMiddleware
)
List
(
ctx
context
.
Context
,
spaceId
string
)
(
clients
[]
*
clients
.
Client
,
err
error
)
{
func
(
m
*
loggingMiddleware
)
List
(
ctx
context
.
Context
,
spaceId
string
)
(
clients
[]
*
clients
.
Client
,
err
error
)
{
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
)
)
clients
,
err
=
m
.
next
.
List
(
ctx
,
spaceId
)
clients
,
err
=
m
.
next
.
List
(
ctx
,
spaceId
)
...
@@ -86,7 +86,7 @@ func (m *loggingMiddleware) List(ctx context.Context, spaceId string) (clients [
...
@@ -86,7 +86,7 @@ func (m *loggingMiddleware) List(ctx context.Context, spaceId string) (clients [
func
(
m
*
loggingMiddleware
)
Update
(
ctx
context
.
Context
,
client
*
clients
.
Client
)
(
err
error
)
{
func
(
m
*
loggingMiddleware
)
Update
(
ctx
context
.
Context
,
client
*
clients
.
Client
)
(
err
error
)
{
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
logzap
.
Event
(
clients
.
EventUpdate
),
logzap
.
Event
(
clients
.
EventUpdate
),
logzap
.
Object
(
client
),
logzap
.
Object
(
client
),
)
)
...
@@ -104,7 +104,7 @@ func (m *loggingMiddleware) Update(ctx context.Context, client *clients.Client)
...
@@ -104,7 +104,7 @@ func (m *loggingMiddleware) Update(ctx context.Context, client *clients.Client)
func
(
m
*
loggingMiddleware
)
Delete
(
ctx
context
.
Context
,
spaceId
,
clientId
string
)
(
err
error
)
{
func
(
m
*
loggingMiddleware
)
Delete
(
ctx
context
.
Context
,
spaceId
,
clientId
string
)
(
err
error
)
{
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
logzap
.
Event
(
clients
.
EventDelete
),
logzap
.
Event
(
clients
.
EventDelete
),
logzap
.
Object
(
id
.
NewClientId
(
spaceId
,
clientId
)),
logzap
.
Object
(
id
.
NewClientId
(
spaceId
,
clientId
)),
)
)
...
@@ -130,7 +130,7 @@ func (m *loggingMiddleware) Enable(ctx context.Context, spaceId, clientId string
...
@@ -130,7 +130,7 @@ func (m *loggingMiddleware) Enable(ctx context.Context, spaceId, clientId string
}
}
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
logzap
.
Event
(
event
),
logzap
.
Event
(
event
),
logzap
.
Object
(
id
.
NewClientId
(
spaceId
,
clientId
)),
logzap
.
Object
(
id
.
NewClientId
(
spaceId
,
clientId
)),
)
)
...
...
This diff is collapsed.
Click to expand it.
pkg/environments/middleware/logging_middleware.go
+
9
−
8
View file @
084b1b3d
...
@@ -2,6 +2,7 @@ package middleware
...
@@ -2,6 +2,7 @@ package middleware
import
(
import
(
"context"
"context"
"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"
...
@@ -25,7 +26,7 @@ func LoggingMiddleware(logger *zap.Logger) Middleware {
...
@@ -25,7 +26,7 @@ func LoggingMiddleware(logger *zap.Logger) Middleware {
func
(
m
*
loggingMiddleware
)
Create
(
ctx
context
.
Context
,
env
*
environments
.
Environment
)
(
created
*
environments
.
Environment
,
err
error
)
{
func
(
m
*
loggingMiddleware
)
Create
(
ctx
context
.
Context
,
env
*
environments
.
Environment
)
(
created
*
environments
.
Environment
,
err
error
)
{
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
logzap
.
Event
(
environments
.
EventCreate
),
logzap
.
Event
(
environments
.
EventCreate
),
logzap
.
Object
(
env
),
logzap
.
Object
(
env
),
)
)
...
@@ -43,7 +44,7 @@ func (m *loggingMiddleware) Create(ctx context.Context, env *environments.Enviro
...
@@ -43,7 +44,7 @@ func (m *loggingMiddleware) Create(ctx context.Context, env *environments.Enviro
func
(
m
*
loggingMiddleware
)
Delete
(
ctx
context
.
Context
,
spaceId
string
,
envId
string
)
(
err
error
)
{
func
(
m
*
loggingMiddleware
)
Delete
(
ctx
context
.
Context
,
spaceId
string
,
envId
string
)
(
err
error
)
{
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
logzap
.
Event
(
environments
.
EventDelete
),
logzap
.
Event
(
environments
.
EventDelete
),
logzap
.
Object
(
id
.
NewEnvironmentId
(
spaceId
,
envId
)),
logzap
.
Object
(
id
.
NewEnvironmentId
(
spaceId
,
envId
)),
)
)
...
@@ -61,7 +62,7 @@ func (m *loggingMiddleware) Delete(ctx context.Context, spaceId string, envId st
...
@@ -61,7 +62,7 @@ func (m *loggingMiddleware) Delete(ctx context.Context, spaceId string, envId st
func
(
m
*
loggingMiddleware
)
Get
(
ctx
context
.
Context
,
spaceId
string
,
envId
string
)
(
env
*
environments
.
Environment
,
err
error
)
{
func
(
m
*
loggingMiddleware
)
Get
(
ctx
context
.
Context
,
spaceId
string
,
envId
string
)
(
env
*
environments
.
Environment
,
err
error
)
{
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
logzap
.
Object
(
id
.
NewEnvironmentId
(
spaceId
,
envId
)),
logzap
.
Object
(
id
.
NewEnvironmentId
(
spaceId
,
envId
)),
)
)
...
@@ -76,7 +77,7 @@ func (m *loggingMiddleware) Get(ctx context.Context, spaceId string, envId strin
...
@@ -76,7 +77,7 @@ func (m *loggingMiddleware) Get(ctx context.Context, spaceId string, envId strin
func
(
m
*
loggingMiddleware
)
List
(
ctx
context
.
Context
,
spaceId
string
)
(
envs
[]
*
environments
.
Environment
,
err
error
)
{
func
(
m
*
loggingMiddleware
)
List
(
ctx
context
.
Context
,
spaceId
string
)
(
envs
[]
*
environments
.
Environment
,
err
error
)
{
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
)
)
envs
,
err
=
m
.
next
.
List
(
ctx
,
spaceId
)
envs
,
err
=
m
.
next
.
List
(
ctx
,
spaceId
)
...
@@ -90,7 +91,7 @@ func (m *loggingMiddleware) List(ctx context.Context, spaceId string) (envs []*e
...
@@ -90,7 +91,7 @@ func (m *loggingMiddleware) List(ctx context.Context, spaceId string) (envs []*e
func
(
m
*
loggingMiddleware
)
Migrate
(
ctx
context
.
Context
,
spaceId
string
,
envId
string
,
options
...*
environments
.
MigrateOptions
)
(
err
error
)
{
func
(
m
*
loggingMiddleware
)
Migrate
(
ctx
context
.
Context
,
spaceId
string
,
envId
string
,
options
...*
environments
.
MigrateOptions
)
(
err
error
)
{
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
logzap
.
Event
(
environments
.
EventMigrate
),
logzap
.
Event
(
environments
.
EventMigrate
),
logzap
.
Object
(
id
.
NewEnvironmentId
(
spaceId
,
envId
)),
logzap
.
Object
(
id
.
NewEnvironmentId
(
spaceId
,
envId
)),
)
)
...
@@ -113,7 +114,7 @@ func (m *loggingMiddleware) Migrate(ctx context.Context, spaceId string, envId s
...
@@ -113,7 +114,7 @@ func (m *loggingMiddleware) Migrate(ctx context.Context, spaceId string, envId s
func
(
m
*
loggingMiddleware
)
RemoveAlias
(
ctx
context
.
Context
,
spaceId
string
,
envId
string
,
alias
string
)
(
err
error
)
{
func
(
m
*
loggingMiddleware
)
RemoveAlias
(
ctx
context
.
Context
,
spaceId
string
,
envId
string
,
alias
string
)
(
err
error
)
{
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
logzap
.
Event
(
environments
.
EventUpdate
),
logzap
.
Event
(
environments
.
EventUpdate
),
logzap
.
Object
(
id
.
NewEnvironmentId
(
spaceId
,
envId
)),
logzap
.
Object
(
id
.
NewEnvironmentId
(
spaceId
,
envId
)),
)
)
...
@@ -131,7 +132,7 @@ func (m *loggingMiddleware) RemoveAlias(ctx context.Context, spaceId string, env
...
@@ -131,7 +132,7 @@ func (m *loggingMiddleware) RemoveAlias(ctx context.Context, spaceId string, env
func
(
m
*
loggingMiddleware
)
SetAlias
(
ctx
context
.
Context
,
spaceId
string
,
envId
string
,
alias
string
)
(
err
error
)
{
func
(
m
*
loggingMiddleware
)
SetAlias
(
ctx
context
.
Context
,
spaceId
string
,
envId
string
,
alias
string
)
(
err
error
)
{
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
logzap
.
Event
(
environments
.
EventUpdate
),
logzap
.
Event
(
environments
.
EventUpdate
),
logzap
.
Object
(
id
.
NewEnvironmentId
(
spaceId
,
envId
)),
logzap
.
Object
(
id
.
NewEnvironmentId
(
spaceId
,
envId
)),
)
)
...
@@ -149,7 +150,7 @@ func (m *loggingMiddleware) SetAlias(ctx context.Context, spaceId string, envId
...
@@ -149,7 +150,7 @@ func (m *loggingMiddleware) SetAlias(ctx context.Context, spaceId string, envId
func
(
m
*
loggingMiddleware
)
Update
(
ctx
context
.
Context
,
env
*
environments
.
Environment
)
(
err
error
)
{
func
(
m
*
loggingMiddleware
)
Update
(
ctx
context
.
Context
,
env
*
environments
.
Environment
)
(
err
error
)
{
logger
:=
m
.
logger
.
With
(
logger
:=
m
.
logger
.
With
(
logzap
.
Caller
FromContext
(
ctx
,
""
),
logzap
.
Caller
(
ctx
),
logzap
.
Event
(
environments
.
EventUpdate
),
logzap
.
Event
(
environments
.
EventUpdate
),
logzap
.
Object
(
env
),
logzap
.
Object
(
env
),
)
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment