From 41dbf53eb33c15f5b615a537b58fd38cb8baee3e Mon Sep 17 00:00:00 2001 From: luky116_Liuyuecai Date: Tue, 14 Jun 2022 09:14:40 +0800 Subject: [PATCH] fix config --- pkg/config/client_config.go | 2 +- pkg/config/getty_config.go | 10 +++++----- test/rpc_remoting_client_test.go | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkg/config/client_config.go b/pkg/config/client_config.go index c2054119..e20a2138 100644 --- a/pkg/config/client_config.go +++ b/pkg/config/client_config.go @@ -34,7 +34,7 @@ type ClientConfig struct { DSN string `yaml:"dsn" json:"dsn,omitempty"` ReportRetryCount int `default:"5" yaml:"report_retry_count" json:"report_retry_count,omitempty"` ReportSuccessEnable bool `default:"false" yaml:"report_success_enable" json:"report_success_enable,omitempty"` - LockRetryInterval time.Duration `default:"10ms" yaml:"lock_retry_interval" json:"lock_retry_interval,omitempty"` + LockRetryInterval time.Duration `default:"10" yaml:"lock_retry_interval" json:"lock_retry_interval,omitempty"` LockRetryTimes int `default:"30" yaml:"lock_retry_times" json:"lock_retry_times,omitempty"` } `yaml:"at" json:"at,omitempty"` } diff --git a/pkg/config/getty_config.go b/pkg/config/getty_config.go index e180cf3f..6f5413c2 100644 --- a/pkg/config/getty_config.go +++ b/pkg/config/getty_config.go @@ -63,13 +63,13 @@ type GettySessionParam struct { CompressEncoding bool `default:"false" yaml:"compress_encoding" json:"compress_encoding,omitempty"` TCPNoDelay bool `default:"true" yaml:"tcp_no_delay" json:"tcp_no_delay,omitempty"` TCPKeepAlive bool `default:"true" yaml:"tcp_keep_alive" json:"tcp_keep_alive,omitempty"` - KeepAlivePeriod time.Duration `default:"180s" yaml:"keep_alive_period" json:"keep_alive_period,omitempty"` - CronPeriod time.Duration `default:"1s" yaml:"keep_alive_period" json:"keep_alive_period,omitempty"` + KeepAlivePeriod time.Duration `default:"180" yaml:"keep_alive_period" json:"keep_alive_period,omitempty"` + CronPeriod time.Duration `default:"1" yaml:"keep_alive_period" json:"keep_alive_period,omitempty"` TCPRBufSize int `default:"262144" yaml:"tcp_r_buf_size" json:"tcp_r_buf_size,omitempty"` TCPWBufSize int `default:"65536" yaml:"tcp_w_buf_size" json:"tcp_w_buf_size,omitempty"` - TCPReadTimeout time.Duration `default:"1s" yaml:"tcp_read_timeout" json:"tcp_read_timeout,omitempty"` - TCPWriteTimeout time.Duration `default:"5s" yaml:"tcp_write_timeout" json:"tcp_write_timeout,omitempty"` - WaitTimeout time.Duration `default:"7s" yaml:"wait_timeout" json:"wait_timeout,omitempty"` + TCPReadTimeout time.Duration `default:"1" yaml:"tcp_read_timeout" json:"tcp_read_timeout,omitempty"` + TCPWriteTimeout time.Duration `default:"5" yaml:"tcp_write_timeout" json:"tcp_write_timeout,omitempty"` + WaitTimeout time.Duration `default:"7" yaml:"wait_timeout" json:"wait_timeout,omitempty"` MaxMsgLen int `default:"4096" yaml:"max_msg_len" json:"max_msg_len,omitempty"` SessionName string `default:"rpc" yaml:"session_name" json:"session_name,omitempty"` } diff --git a/test/rpc_remoting_client_test.go b/test/rpc_remoting_client_test.go index 446c9583..2802bf1e 100644 --- a/test/rpc_remoting_client_test.go +++ b/test/rpc_remoting_client_test.go @@ -19,7 +19,6 @@ package test import ( "testing" - "time" ) import ( @@ -40,5 +39,5 @@ func TestSendMsgWithResponse(test *testing.T) { //} //handler := GetGettyClientHandlerInstance() //handler.sendMergedMessage(mergedMessage) - time.Sleep(100000 * time.Second) + //time.Sleep(100000 * time.Second) }