go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-02-13 13:48:51 +02:00
Code Issues Releases Activity

fix keepalive bug (#484)

Browse Source
This commit is contained in:
longxboy 2020-01-16 11:57:25 +08:00 committed by Tony
parent c18d7cc6ec
commit 8691205479
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/net/rpc/warden/client.go
View File

@ -27,6 +27,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"google.golang.org/grpc/keepalive"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"google.golang.org/grpc/peer" "google.golang.org/grpc/peer"
gstatus "google.golang.org/grpc/status" gstatus "google.golang.org/grpc/status"
@ -274,6 +275,11 @@ func (c *Client) dial(ctx context.Context, target string, opts ...grpc.DialOptio
if !c.conf.NonBlock { if !c.conf.NonBlock {
dialOptions = append(dialOptions, grpc.WithBlock()) dialOptions = append(dialOptions, grpc.WithBlock())
} }
dialOptions = append(dialOptions, grpc.WithKeepaliveParams(keepalive.ClientParameters{
Time: time.Duration(c.conf.KeepAliveInterval),
Timeout: time.Duration(c.conf.KeepAliveTimeout),
PermitWithoutStream: !c.conf.KeepAliveWithoutStream,
}))
dialOptions = append(dialOptions, opts...) dialOptions = append(dialOptions, opts...)
// init default handler // init default handler

2
pkg/net/rpc/warden/server.go
View File

@ -36,7 +36,7 @@ var (
Network: "tcp", Network: "tcp",
Addr: "0.0.0.0:9000", Addr: "0.0.0.0:9000",
Timeout: xtime.Duration(time.Second), Timeout: xtime.Duration(time.Second),
IdleTimeout: xtime.Duration(time.Second * 60), IdleTimeout: xtime.Duration(time.Second * 180),
MaxLifeTime: xtime.Duration(time.Hour * 2), MaxLifeTime: xtime.Duration(time.Hour * 2),
ForceCloseWait: xtime.Duration(time.Second * 20), ForceCloseWait: xtime.Duration(time.Second * 20),
KeepAliveInterval: xtime.Duration(time.Second * 60), KeepAliveInterval: xtime.Duration(time.Second * 60),