realloc/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Releases Packages Activity

[#1502] Use zap.Error for logging errors

Browse source 
Use `zap.Error` instead of `zap.String` for logging errors: change all expressions like
`zap.String("error", err.Error())` or `zap.String("err", err.Error())` to `zap.Error(err)`.
Leave similar expressions with other messages unchanged, for example,
`zap.String("last_error", lastErr.Error())` or `zap.String("reason", ctx.Err().Error())`.

This change was made by applying the following patch:
```diff
@@
var err expression
@@
-zap.String("error", err.Error())
+zap.Error(err)

@@
var err expression
@@
-zap.String("err", err.Error())
+zap.Error(err)
```

Signed-off-by: Aleksey Savchuk <a.savchuk@yadro.com>
This commit is contained in:
Aleksey Savchuk 2024-12-13 11:44:56 +03:00
parent 8ba9f31fca
commit f0c43c8d80
Signed by: a-savchuk
GPG key ID: 70C0A7FF6F9C4639
56 changed files with 114 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/services/object/delete/delete.go
View file

@ -36,7 +36,7 @@ func (exec *execCtx) execute(ctx context.Context) error {
exec.log.Debug(ctx, logs.ServingRequest)
if err := exec.executeLocal(ctx); err != nil {
exec.log.Debug(ctx, logs.OperationFinishedWithError, zap.String("error", err.Error()))
exec.log.Debug(ctx, logs.OperationFinishedWithError, zap.Error(err))
return err
}

8
pkg/services/object/search/container.go
View file

@ -73,7 +73,7 @@ func (exec *execCtx) processCurrentEpoch(ctx context.Context) error {
select {
case <-ctx.Done():
exec.log.Debug(ctx, logs.InterruptPlacementIterationByContext,
zap.String("error", ctx.Err().Error()))
zap.Error(ctx.Err()))
return
default:
}
@ -86,14 +86,14 @@ func (exec *execCtx) processCurrentEpoch(ctx context.Context) error {
c, err := exec.svc.clientConstructor.get(info)
if err != nil {
exec.log.Debug(ctx, logs.SearchCouldNotConstructRemoteNodeClient, zap.String("error", err.Error()))
exec.log.Debug(ctx, logs.SearchCouldNotConstructRemoteNodeClient, zap.Error(err))
return
}
ids, err := c.searchObjects(ctx, exec, info)
if err != nil {
exec.log.Debug(ctx, logs.SearchRemoteOperationFailed,
zap.String("error", err.Error()))
zap.Error(err))
return
}
@ -102,7 +102,7 @@ func (exec *execCtx) processCurrentEpoch(ctx context.Context) error {
err = exec.writeIDList(ids)
mtx.Unlock()
if err != nil {
exec.log.Debug(ctx, logs.SearchCouldNotWriteObjectIdentifiers, zap.String("error", err.Error()))
exec.log.Debug(ctx, logs.SearchCouldNotWriteObjectIdentifiers, zap.Error(err))
return
}
}(i)

2
pkg/services/object/search/local.go
View file

@ -11,7 +11,7 @@ import (
func (exec *execCtx) executeLocal(ctx context.Context) error {
ids, err := exec.svc.localStorage.search(ctx, exec)
if err != nil {
exec.log.Debug(ctx, logs.SearchLocalOperationFailed, zap.String("error", err.Error()))
exec.log.Debug(ctx, logs.SearchLocalOperationFailed, zap.Error(err))
return err
}

2
pkg/services/object/search/search.go
View file

@ -38,7 +38,7 @@ func (exec *execCtx) execute(ctx context.Context) error {
func (exec *execCtx) logResult(ctx context.Context, err error) {
switch {
default:
exec.log.Debug(ctx, logs.OperationFinishedWithError, zap.String("error", err.Error()))
exec.log.Debug(ctx, logs.OperationFinishedWithError, zap.Error(err))
case err == nil:
exec.log.Debug(ctx, logs.OperationFinishedSuccessfully)
}

4
pkg/services/object/util/log.go
View file

@ -14,7 +14,7 @@ func LogServiceError(ctx context.Context, l *logger.Logger, req string, node net
l.Error(ctx, logs.UtilObjectServiceError,
zap.String("node", network.StringifyGroup(node)),
zap.String("request", req),
zap.String("error", err.Error()),
zap.Error(err),
)
}
@ -22,6 +22,6 @@ func LogServiceError(ctx context.Context, l *logger.Logger, req string, node net
func LogWorkerPoolError(ctx context.Context, l *logger.Logger, req string, err error) {
l.Error(ctx, logs.UtilCouldNotPushTaskToWorkerPool,
zap.String("request", req),
zap.String("error", err.Error()),
zap.Error(err),
)
}