Skip to content

Commit e516fe1

Browse files
committed
update
1 parent 94e22d8 commit e516fe1

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

codegen/tml/config/template_config.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ type CGrpcServerConfig struct {
260260
//CGrpcClientConfig
261261
type CGrpcClientConfig struct {
262262
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
264264
HeartProbe ctime.Duration $json:"heart_probe"$ //default 1.5s
265265
}
266266
@@ -274,7 +274,7 @@ type CrpcServerConfig struct {
274274
//CrpcClientConfig -
275275
type CrpcClientConfig struct {
276276
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
278278
HeartProbe ctime.Duration $json:"heart_probe"$ //default 1.5s
279279
}
280280
@@ -299,7 +299,7 @@ type WebCorsConfig struct {
299299
//WebClientConfig -
300300
type WebClientConfig struct {
301301
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
303303
IdleTimeout ctime.Duration $json:"idle_timeout"$ //default 5s
304304
HeartProbe ctime.Duration $json:"heart_probe"$ //default 1.5s
305305
}
@@ -419,8 +419,8 @@ func initsource(path string) {
419419
if sc.CGrpcClient.ConnectTimeout <= 0 {
420420
sc.CGrpcClient.ConnectTimeout = ctime.Duration(time.Millisecond * 500)
421421
}
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
424424
}
425425
if sc.CGrpcClient.HeartProbe <= 0 {
426426
sc.CGrpcClient.HeartProbe = ctime.Duration(time.Millisecond * 1500)
@@ -453,8 +453,8 @@ func initsource(path string) {
453453
if sc.CrpcClient.ConnectTimeout <= 0 {
454454
sc.CrpcClient.ConnectTimeout = ctime.Duration(time.Millisecond * 500)
455455
}
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
458458
}
459459
if sc.CrpcClient.HeartProbe <= 0 {
460460
sc.CrpcClient.HeartProbe = ctime.Duration(time.Millisecond * 1500)
@@ -505,8 +505,8 @@ func initsource(path string) {
505505
if sc.WebClient.ConnectTimeout <= 0 {
506506
sc.WebClient.ConnectTimeout = ctime.Duration(time.Millisecond * 500)
507507
}
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
510510
}
511511
if sc.WebClient.IdleTimeout <= 0 {
512512
sc.WebClient.IdleTimeout = ctime.Duration(time.Second * 5)

0 commit comments

Comments
 (0)