Move diff from nspcc master and support branches #28

Merged
fyrchik merged 28 commits from move-changes into master 2023-01-25 12:31:47 +00:00
Showing only changes of commit 644b84da83 - Show all commits

View file

@ -6,9 +6,9 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
) )
// LogServiceError writes debug error message of object service to provided logger. // LogServiceError writes error message of object service to provided logger.
func LogServiceError(l *logger.Logger, req string, node network.AddressGroup, err error) { func LogServiceError(l *logger.Logger, req string, node network.AddressGroup, err error) {
l.Debug("object service error", l.Error("object service error",
zap.String("node", network.StringifyGroup(node)), zap.String("node", network.StringifyGroup(node)),
zap.String("request", req), zap.String("request", req),
zap.String("error", err.Error()), zap.String("error", err.Error()),
@ -17,7 +17,7 @@ func LogServiceError(l *logger.Logger, req string, node network.AddressGroup, er
// LogWorkerPoolError writes debug error message of object worker pool to provided logger. // LogWorkerPoolError writes debug error message of object worker pool to provided logger.
func LogWorkerPoolError(l *logger.Logger, req string, err error) { func LogWorkerPoolError(l *logger.Logger, req string, err error) {
l.Debug("could not push task to worker pool", l.Error("could not push task to worker pool",
zap.String("request", req), zap.String("request", req),
zap.String("error", err.Error()), zap.String("error", err.Error()),
) )