Skip to content

Add a keepalive timeout on the locket client #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 19, 2023
Merged

Add a keepalive timeout on the locket client #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions locket_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ import (
)

type ClientLocketConfig struct {
LocketAddress string `json:"locket_address,omitempty" yaml:"locket_address,omitempty"`
LocketCACertFile string `json:"locket_ca_cert_file,omitempty" yaml:"locket_ca_cert_file,omitempty"`
LocketClientCertFile string `json:"locket_client_cert_file,omitempty" yaml:"locket_client_cert_file,omitempty"`
LocketClientKeyFile string `json:"locket_client_key_file,omitempty" yaml:"locket_client_key_file,omitempty"`
LocketAddress string `json:"locket_address,omitempty" yaml:"locket_address,omitempty"`
LocketCACertFile string `json:"locket_ca_cert_file,omitempty" yaml:"locket_ca_cert_file,omitempty"`
LocketClientCertFile string `json:"locket_client_cert_file,omitempty" yaml:"locket_client_cert_file,omitempty"`
LocketClientKeyFile string `json:"locket_client_key_file,omitempty" yaml:"locket_client_key_file,omitempty"`
LocketClientKeepAliveTime int `json:"locket_client_keepalive_time,omitempty" yaml:"locket_client_keepalive_time,omitempty"`
LocketClientKeepAliveTimeout int `json:"locket_client_keepalive_timeout,omitempty" yaml:"locket_client_keepalive_timeout,omitempty"`
}

func NewClientSkipCertVerify(logger lager.Logger, config ClientLocketConfig) (models.LocketClient, error) {
Expand Down Expand Up @@ -59,7 +61,8 @@ func newClientInternal(logger lager.Logger, config ClientLocketConfig, skipCertV
grpc.WithBlock(),
grpc.WithTimeout(10*time.Second), // ensure that grpc won't keep retrying forever
grpc.WithKeepaliveParams(keepalive.ClientParameters{
Time: 10 * time.Second,
Time: time.Duration(config.LocketClientKeepAliveTime) * time.Second,
Timeout: time.Duration(config.LocketClientKeepAliveTimeout) * time.Second,
}),
)
if err != nil {
Expand Down