Merge branch 'main' of github.com:chenjie199234/Corelib into main

Author: chenjie

cgrpc/server.go

@@ -203,10 +203,7 @@ func (this *CGrpcServer) UpdateHandlerTimeout(htcs map[string]time.Duration) {
 
 func (this *CGrpcServer) getHandlerTimeout(path string) time.Duration {
 	handlerTimeout := *(*map[string]time.Duration)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(&this.handlerTimeout))))
-	if t, ok := handlerTimeout[path]; ok {
-		if this.c.GlobalTimeout <= t {
-			return this.c.GlobalTimeout
-		}
+	if t, ok := handlerTimeout[path]; ok && (this.c.GlobalTimeout == 0 || t < this.c.GlobalTimeout) {
 		return t
 	}
 	return this.c.GlobalTimeout

crpc/server.go

@@ -211,10 +211,7 @@ func (this *CrpcServer) UpdateHandlerTimeout(htcs map[string]time.Duration) {
 
 func (this *CrpcServer) getHandlerTimeout(path string) time.Duration {
 	handlerTimeout := *(*map[string]time.Duration)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(&this.handlerTimeout))))
-	if t, ok := handlerTimeout[path]; ok {
-		if this.c.GlobalTimeout <= t {
-			return this.c.GlobalTimeout
-		}
+	if t, ok := handlerTimeout[path]; ok && (this.c.GlobalTimeout == 0 || t < this.c.GlobalTimeout) {
 		return t
 	}
 	return this.c.GlobalTimeout

web/server.go

@@ -369,10 +369,7 @@ func (this *WebServer) UpdateHandlerTimeout(htcs map[string]map[string]time.Dura
 func (this *WebServer) getHandlerTimeout(method, path string) time.Duration {
 	handlerTimeout := *(*map[string]map[string]time.Duration)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(&this.handlerTimeout))))
 	if m, ok := handlerTimeout[method]; ok {
-		if t, ok := m[path]; ok {
-			if this.c.GlobalTimeout <= t {
-				return this.c.GlobalTimeout
-			}
+		if t, ok := m[path]; ok && (this.c.GlobalTimeout == 0 || t < this.c.GlobalTimeout) {
 			return t
 		}
 	}