github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-02-03 00:38:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

zrpc client support block (#412)

Browse Source
This commit is contained in:
HarryWang29 2021-02-19 10:24:03 +08:00 committed by GitHub
parent 7472d1e70b
commit d239952d2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zrpc/config.go
View File

@ -25,7 +25,7 @@ type (
Endpoints []string `json:",optional=!Etcd"` Endpoints []string `json:",optional=!Etcd"`
App string `json:",optional"` App string `json:",optional"`
Token string `json:",optional"` Token string `json:",optional"`
Timeout int64 `json:",optional"` Timeout int64 `json:",default=2000"`
} }
) )

9
zrpc/internal/clientinterceptors/timeoutinterceptor.go
View File

@ -8,15 +8,12 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
) )
const defaultTimeout = time.Second * 2
func TimeoutInterceptor(timeout time.Duration) grpc.UnaryClientInterceptor { func TimeoutInterceptor(timeout time.Duration) grpc.UnaryClientInterceptor {
if timeout <= 0 {
timeout = defaultTimeout
}
return func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, return func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn,
invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error { invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
if timeout == 0 {
return invoker(ctx, method, req, reply, cc, opts...)
}
ctx, cancel := contextx.ShrinkDeadline(ctx, timeout) ctx, cancel := contextx.ShrinkDeadline(ctx, timeout)
defer cancel() defer cancel()
return invoker(ctx, method, req, reply, cc, opts...) return invoker(ctx, method, req, reply, cc, opts...)