Skip to content

Commit 75257e8

Browse files
committed
Strip secret fields from grpc logging
1 parent 852971f commit 75257e8

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

pkg/gce-pd-csi-driver/server.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"google.golang.org/grpc"
2525

2626
csi "github.com/container-storage-interface/spec/lib/go/csi"
27+
"github.com/kubernetes-csi/csi-lib-utils/connection"
2728
)
2829

2930
// Defines Non blocking GRPC server interfaces
@@ -71,7 +72,7 @@ func (s *nonBlockingGRPCServer) ForceStop() {
7172

7273
func (s *nonBlockingGRPCServer) serve(endpoint string, ids csi.IdentityServer, cs csi.ControllerServer, ns csi.NodeServer) {
7374
opts := []grpc.ServerOption{
74-
grpc.UnaryInterceptor(logGRPC),
75+
grpc.UnaryInterceptor(connection.LogGRPC),
7576
}
7677

7778
u, err := url.Parse(endpoint)

pkg/gce-pd-csi-driver/utils.go

-15
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ package gceGCEDriver
1818

1919
import (
2020
csi "github.com/container-storage-interface/spec/lib/go/csi"
21-
"github.com/golang/glog"
22-
"golang.org/x/net/context"
23-
"google.golang.org/grpc"
2421
)
2522

2623
func NewVolumeCapabilityAccessMode(mode csi.VolumeCapability_AccessMode_Mode) *csi.VolumeCapability_AccessMode {
@@ -46,15 +43,3 @@ func NewNodeServiceCapability(cap csi.NodeServiceCapability_RPC_Type) *csi.NodeS
4643
},
4744
}
4845
}
49-
50-
func logGRPC(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
51-
glog.V(3).Infof("GRPC call: %s", info.FullMethod)
52-
glog.V(5).Infof("GRPC request: %+v", req)
53-
resp, err := handler(ctx, req)
54-
if err != nil {
55-
glog.Errorf("GRPC error: %v", err)
56-
} else {
57-
glog.V(5).Infof("GRPC response: %+v", resp)
58-
}
59-
return resp, err
60-
}

0 commit comments

Comments
 (0)