zlei6/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2026-05-11 00:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: api group set timeout: 0s not working." (#4931)

Browse Source
This commit is contained in:
Kevin Wan
2025-06-08 23:14:38 +08:00
committed by GitHub
parent 19fec36d24
commit 0f2b589d4d
5 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rest/engine.go
View File

@@ -62,8 +62,8 @@ func (ng *engine) addRoutes(r featuredRoutes) {
// need to guarantee the timeout is the max of all routes
// otherwise impossible to set http.Server.ReadTimeout & WriteTimeout
if r.timeout != nil {
ng.timeout = *r.timeout
if r.timeout > ng.timeout {
ng.timeout = r.timeout
}
}
@@ -192,9 +192,9 @@ func (ng *engine) checkedMaxBytes(bytes int64) int64 {
return ng.conf.MaxBytes
}
func (ng *engine) checkedTimeout(timeout *time.Duration) time.Duration {
if timeout != nil {
return *timeout
func (ng *engine) checkedTimeout(timeout time.Duration) time.Duration {
if timeout > 0 {
return timeout
}
return time.Duration(ng.conf.Timeout) * time.Millisecond