diff options
| author | bingoohuang <bingoo.huang@gmail.com> | 2021-02-09 09:49:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-09 09:49:28 +0800 |
| commit | 12a78335860c4b1e220748e4adc4097050af5272 (patch) | |
| tree | 545519d7e38d6b17e9accb6dd3b253af26d1852a /weed | |
| parent | 9e06ef66b9bcca1c2cefc5cd38c34a20cb912c41 (diff) | |
| parent | 5b1def9080b44913280af52821798a9850b42eff (diff) | |
| download | seaweedfs-12a78335860c4b1e220748e4adc4097050af5272.tar.xz seaweedfs-12a78335860c4b1e220748e4adc4097050af5272.zip | |
Merge pull request #1 from chrislusf/master
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/pb/grpc_client_server.go | 5 | ||||
| -rw-r--r-- | weed/util/constants.go | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/weed/pb/grpc_client_server.go b/weed/pb/grpc_client_server.go index 4d78d769f..9ffda9b04 100644 --- a/weed/pb/grpc_client_server.go +++ b/weed/pb/grpc_client_server.go @@ -35,8 +35,9 @@ func NewGrpcServer(opts ...grpc.ServerOption) *grpc.Server { var options []grpc.ServerOption options = append(options, grpc.KeepaliveParams(keepalive.ServerParameters{ - Time: 10 * time.Second, // wait time before ping if no activity - Timeout: 20 * time.Second, // ping timeout + Time: 10 * time.Second, // wait time before ping if no activity + Timeout: 20 * time.Second, // ping timeout + MaxConnectionAge: 10 * time.Hour, }), grpc.KeepaliveEnforcementPolicy(keepalive.EnforcementPolicy{ MinTime: 60 * time.Second, // min time a client should wait before sending a ping diff --git a/weed/util/constants.go b/weed/util/constants.go index ccc0ef1fb..6001ae78e 100644 --- a/weed/util/constants.go +++ b/weed/util/constants.go @@ -5,7 +5,7 @@ import ( ) var ( - VERSION = fmt.Sprintf("%s %d.%02d", sizeLimit, 2, 23) + VERSION = fmt.Sprintf("%s %d.%02d", sizeLimit, 2, 24) COMMIT = "" ) |