JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg/server: Don't use Sugared logger (#2935)

Browse Source 
Replace the usage of the Sugared logger by the normal one.
This commit is contained in:
Ivan Fraixedes 2019-09-03 11:39:26 +02:00 committed by GitHub
parent 3fbe31aada
commit d7d6e23a3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/server/interceptors.go
View File

@ -29,7 +29,7 @@ func (server *Server) logOnErrorStreamInterceptor(srv interface{}, ss grpc.Serve
err == io.EOF {
return err
}
server.log.Sugar().Errorf("%+v", err)
server.log.Error("gRPC stream error response", zap.Error(err))
}
return err
}
@ -41,7 +41,7 @@ func (server *Server) logOnErrorUnaryInterceptor(ctx context.Context, req interf
if status.Code(err) == codes.NotFound {
return resp, err
}
server.log.Sugar().Errorf("%+v", err)
server.log.Error("gRPC unary error response", zap.Error(err))
}
return resp, err
}
@ -91,7 +91,9 @@ func UnaryMessageLoggingInterceptor(log *zap.Logger) grpc.UnaryServerInterceptor
if jsonReq, err := prepareRequestLog(ctx, req, info.Server, info.FullMethod); err == nil {
log.Info(string(jsonReq))
} else {
log.Sugar().Errorf("Failed to marshal %q request to JSON: %v", info.FullMethod, err)
log.Error("Failed to marshal request to JSON.",
zap.String("method", info.FullMethod), zap.Error(err),
)
}
return handler(ctx, req)
}
@ -106,7 +108,9 @@ func StreamMessageLoggingInterceptor(log *zap.Logger) grpc.StreamServerIntercept
if jsonReq, err := prepareRequestLog(ss.Context(), srv, nil, info.FullMethod); err == nil {
log.Info(string(jsonReq))
} else {
log.Sugar().Errorf("Failed to marshal %q request to JSON: %v", info.FullMethod, err)
log.Error("Failed to marshal request to JSON.",
zap.String("method", info.FullMethod), zap.Error(err),
)
}
return handler(srv, ss)
}