Skip to content

Commit

Permalink
Merge pull request kubernetes-csi#24 from msau42/release-1.0
Browse files Browse the repository at this point in the history
Cherry-pick kubernetes-csi#23 to release-1.0: Use logging util
  • Loading branch information
k8s-ci-robot committed Nov 30, 2018
2 parents a81dfaa + 85261f3 commit 857ef60
Show file tree
Hide file tree
Showing 23 changed files with 8,791 additions and 132 deletions.
50 changes: 15 additions & 35 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,7 @@
[[constraint]]
name = "github.com/golang/mock"
version = "1.1.1"

[[constraint]]
name = "github.com/kubernetes-csi/csi-lib-utils"
version = "0.1.0"
5 changes: 3 additions & 2 deletions pkg/connection/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (

"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/golang/glog"
"github.com/kubernetes-csi/csi-lib-utils/protosanitizer"
"google.golang.org/grpc"
"google.golang.org/grpc/connectivity"
)
Expand Down Expand Up @@ -129,9 +130,9 @@ func (c *csiConnection) Close() error {

func logGRPC(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
glog.Infof("GRPC call: %s", method)
glog.Infof("GRPC request: %+v", req)
glog.Infof("GRPC request: %s", protosanitizer.StripSecrets(req))
err := invoker(ctx, method, req, reply, cc, opts...)
glog.Infof("GRPC response: %+v", reply)
glog.Infof("GRPC response: %s", protosanitizer.StripSecrets(reply))
glog.Infof("GRPC error: %v", err)
return err
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 857ef60

Please sign in to comment.