@@ -260,7 +260,7 @@ type CGrpcServerConfig struct {
260
260
//CGrpcClientConfig
261
261
type CGrpcClientConfig struct {
262
262
ConnectTimeout ctime.Duration $json:"conn_timeout"$ //default 500ms,max time to finish the handshake
263
- GlobalTimeout ctime.Duration $json:"global_timeout"$ //default 500ms, max time to handle the request
263
+ GlobalTimeout ctime.Duration $json:"global_timeout"$ //max time to handle the request,0 means no default timeout
264
264
HeartProbe ctime.Duration $json:"heart_probe"$ //default 1.5s
265
265
}
266
266
@@ -274,7 +274,7 @@ type CrpcServerConfig struct {
274
274
//CrpcClientConfig -
275
275
type CrpcClientConfig struct {
276
276
ConnectTimeout ctime.Duration $json:"conn_timeout"$ //default 500ms,max time to finish the handshake
277
- GlobalTimeout ctime.Duration $json:"global_timeout"$ //default 500ms, max time to handle the request
277
+ GlobalTimeout ctime.Duration $json:"global_timeout"$ //max time to handle the request,0 means no default timeout
278
278
HeartProbe ctime.Duration $json:"heart_probe"$ //default 1.5s
279
279
}
280
280
@@ -299,7 +299,7 @@ type WebCorsConfig struct {
299
299
//WebClientConfig -
300
300
type WebClientConfig struct {
301
301
ConnectTimeout ctime.Duration $json:"conn_timeout"$ //default 500ms,max time to finish the handshake
302
- GlobalTimeout ctime.Duration $json:"global_timeout"$ //default 500ms, max time to handle the request
302
+ GlobalTimeout ctime.Duration $json:"global_timeout"$ //max time to handle the request,0 means no default timeout
303
303
IdleTimeout ctime.Duration $json:"idle_timeout"$ //default 5s
304
304
HeartProbe ctime.Duration $json:"heart_probe"$ //default 1.5s
305
305
}
@@ -419,8 +419,8 @@ func initsource(path string) {
419
419
if sc.CGrpcClient.ConnectTimeout <= 0 {
420
420
sc.CGrpcClient.ConnectTimeout = ctime.Duration(time.Millisecond * 500)
421
421
}
422
- if sc.CGrpcClient.GlobalTimeout <= 0 {
423
- sc.CGrpcClient.GlobalTimeout = ctime.Duration(time.Millisecond * 500)
422
+ if sc.CGrpcClient.GlobalTimeout < 0 {
423
+ sc.CGrpcClient.GlobalTimeout = 0
424
424
}
425
425
if sc.CGrpcClient.HeartProbe <= 0 {
426
426
sc.CGrpcClient.HeartProbe = ctime.Duration(time.Millisecond * 1500)
@@ -453,8 +453,8 @@ func initsource(path string) {
453
453
if sc.CrpcClient.ConnectTimeout <= 0 {
454
454
sc.CrpcClient.ConnectTimeout = ctime.Duration(time.Millisecond * 500)
455
455
}
456
- if sc.CrpcClient.GlobalTimeout <= 0 {
457
- sc.CrpcClient.GlobalTimeout = ctime.Duration(time.Millisecond * 500)
456
+ if sc.CrpcClient.GlobalTimeout < 0 {
457
+ sc.CrpcClient.GlobalTimeout = 0
458
458
}
459
459
if sc.CrpcClient.HeartProbe <= 0 {
460
460
sc.CrpcClient.HeartProbe = ctime.Duration(time.Millisecond * 1500)
@@ -505,8 +505,8 @@ func initsource(path string) {
505
505
if sc.WebClient.ConnectTimeout <= 0 {
506
506
sc.WebClient.ConnectTimeout = ctime.Duration(time.Millisecond * 500)
507
507
}
508
- if sc.WebClient.GlobalTimeout <= 0 {
509
- sc.WebClient.GlobalTimeout = ctime.Duration(time.Millisecond * 500)
508
+ if sc.WebClient.GlobalTimeout < 0 {
509
+ sc.WebClient.GlobalTimeout = 0
510
510
}
511
511
if sc.WebClient.IdleTimeout <= 0 {
512
512
sc.WebClient.IdleTimeout = ctime.Duration(time.Second * 5)
0 commit comments