Merge pull request #997 from ncteisen/stress_client_flags
Add new flags to go stress client
diff --git a/Documentation/grpc-auth-support.md b/Documentation/grpc-auth-support.md
index 5312b57..248d272 100644
--- a/Documentation/grpc-auth-support.md
+++ b/Documentation/grpc-auth-support.md
@@ -26,7 +26,7 @@
## Google Compute Engine (GCE)
```Go
-conn, err := grpc.Dial(serverAddr, grpc.WithTransportCredentials(credentials.NewClientTLSFromCert(nil, ""), grpc.WithPerRPCCredentials(oauth.NewComputeEngine())))
+conn, err := grpc.Dial(serverAddr, grpc.WithTransportCredentials(credentials.NewClientTLSFromCert(nil, "")), grpc.WithPerRPCCredentials(oauth.NewComputeEngine()))
```
## JWT
@@ -36,6 +36,6 @@
if err != nil {
log.Fatalf("Failed to create JWT credentials: %v", err)
}
-conn, err := grpc.Dial(serverAddr, grpc.WithTransportCredentials(credentials.NewClientTLSFromCert(nil, ""), grpc.WithPerRPCCredentials(jwtCreds)))
+conn, err := grpc.Dial(serverAddr, grpc.WithTransportCredentials(credentials.NewClientTLSFromCert(nil, "")), grpc.WithPerRPCCredentials(jwtCreds))
```
diff --git a/grpclog/glogger/glogger.go b/grpclog/glogger/glogger.go
index 53e3c53..43b886c 100644
--- a/grpclog/glogger/glogger.go
+++ b/grpclog/glogger/glogger.go
@@ -37,6 +37,8 @@
package glogger
import (
+ "fmt"
+
"github.com/golang/glog"
"google.golang.org/grpc/grpclog"
)
@@ -48,25 +50,25 @@
type glogger struct{}
func (g *glogger) Fatal(args ...interface{}) {
- glog.Fatal(args...)
+ glog.FatalDepth(2, args...)
}
func (g *glogger) Fatalf(format string, args ...interface{}) {
- glog.Fatalf(format, args...)
+ glog.FatalDepth(2, fmt.Sprintf(format, args...))
}
func (g *glogger) Fatalln(args ...interface{}) {
- glog.Fatalln(args...)
+ glog.FatalDepth(2, fmt.Sprintln(args...))
}
func (g *glogger) Print(args ...interface{}) {
- glog.Info(args...)
+ glog.InfoDepth(2, args...)
}
func (g *glogger) Printf(format string, args ...interface{}) {
- glog.Infof(format, args...)
+ glog.InfoDepth(2, fmt.Sprintf(format, args...))
}
func (g *glogger) Println(args ...interface{}) {
- glog.Infoln(args...)
+ glog.InfoDepth(2, fmt.Sprintln(args...))
}
diff --git a/interop/test_utils.go b/interop/test_utils.go
index e0f8bd8..e9d734e 100644
--- a/interop/test_utils.go
+++ b/interop/test_utils.go
@@ -254,7 +254,9 @@
Payload: pl,
}
if err := stream.Send(req); err != nil {
- grpclog.Fatalf("%v.Send(%v) = %v", stream, req, err)
+ if grpc.Code(err) != codes.DeadlineExceeded {
+ grpclog.Fatalf("%v.Send(_) = %v", stream, err)
+ }
}
if _, err := stream.Recv(); grpc.Code(err) != codes.DeadlineExceeded {
grpclog.Fatalf("%v.Recv() = _, %v, want error code %d", stream, err, codes.DeadlineExceeded)
