浏览代码

fix:remove config timeout default value

wenzuochao 6 年之前
父节点
当前提交
24303ac350
共有 4 个文件被更改,包括 4 次插入3 次删除
  1. 1 1
      sdk/client.go
  2. 1 0
      sdk/client_test.go
  3. 1 1
      sdk/config.go
  4. 1 1
      sdk/config_test.go

+ 1 - 1
sdk/client.go

@@ -403,7 +403,7 @@ func (client *Client) getTimeout(request requests.AcsRequest) (time.Duration, ti
 		readTimeout = reqReadTimeout
 	} else if client.readTimeout != 0*time.Millisecond {
 		readTimeout = client.readTimeout
-	} else if client.httpClient.Timeout != 0 && client.httpClient.Timeout != 10000000000 {
+	} else if client.httpClient.Timeout != 0 {
 		readTimeout = client.httpClient.Timeout
 	} else if timeout, ok := getAPIMaxTimeout(request.GetProduct(), request.GetActionName()); ok {
 		readTimeout = timeout

+ 1 - 0
sdk/client_test.go

@@ -81,6 +81,7 @@ func Test_NewClientWithOptions(t *testing.T) {
 	c.EnableAsync = true
 	c.GoRoutinePoolSize = 1
 	c.MaxTaskQueueSize = 1
+	c.Timeout = 10 * time.Second
 	credential := credentials.NewAccessKeyCredential("acesskeyid", "accesskeysecret")
 	client, err := NewClientWithOptions("regionid", c, credential)
 	assert.Nil(t, err)

+ 1 - 1
sdk/config.go

@@ -26,12 +26,12 @@ type Config struct {
 	MaxRetryTime      int             `default:"3"`
 	UserAgent         string          `default:""`
 	Debug             bool            `default:"false"`
-	Timeout           time.Duration   `default:"10000000000"`
 	HttpTransport     *http.Transport `default:""`
 	EnableAsync       bool            `default:"false"`
 	MaxTaskQueueSize  int             `default:"1000"`
 	GoRoutinePoolSize int             `default:"5"`
 	Scheme            string          `default:"HTTP"`
+	Timeout           time.Duration
 }
 
 func NewConfig() (config *Config) {

+ 1 - 1
sdk/config_test.go

@@ -15,7 +15,7 @@ func Test_Config(t *testing.T) {
 	assert.Equal(t, 3, config.MaxRetryTime, "Default MaxRetryTime should be 3")
 	assert.Equal(t, "", config.UserAgent, "Default UserAgent should be empty")
 	assert.Equal(t, false, config.Debug, "Default AutoRetry should be false")
-	assert.Equal(t, time.Duration(10000000000), config.Timeout, "Default Timeout should be 10000000000")
+	assert.Equal(t, time.Duration(0), config.Timeout, "Default Timeout should be 10000000000")
 	assert.Equal(t, (*http.Transport)(nil), config.HttpTransport, "Default HttpTransport should be nil")
 	assert.Equal(t, false, config.EnableAsync, "Default EnableAsync should be false")
 	assert.Equal(t, 1000, config.MaxTaskQueueSize, "Default MaxTaskQueueSize should be 1000")