update

Author: chenjie199234

codegen/tml/config/template_config.go

@@ -270,6 +270,7 @@ type CrpcClientConfig struct {
 
 //WebServerConfig -
 type WebServerConfig struct {
+	CloseMode      int            $json:"close_mode"$
 	ConnectTimeout ctime.Duration $json:"connect_timeout"$ //default 500ms,max time to finish the handshake and read each whole request
 	GlobalTimeout  ctime.Duration $json:"global_timeout"$  //default 500ms,max time to handle the request,unless the specific handle timeout is used in HandlerTimeout in AppConfig,handler's timeout will also be effected by caller's deadline
 	IdleTimeout    ctime.Duration $json:"idle_timeout"$    //default 5s

codegen/tml/configfile/template_configfile.go

@@ -28,6 +28,7 @@ const textsource = `{
 		"heart_probe":"1.5s"
 	},
 	"web_server":{
+		"close_mode":0,
 		"connect_timeout":"200ms",
 		"global_timeout":"200ms",
 		"idle_timeout":"5s",

codegen/tml/gomod/template_gomod.go

@@ -12,11 +12,11 @@ go 1.18
 
 require (
 	github.com/chenjie199234/config v0.0.1
-	github.com/chenjie199234/Corelib v0.0.61
+	github.com/chenjie199234/Corelib v0.0.62
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/segmentio/kafka-go v0.4.31
-	go.mongodb.org/mongo-driver v1.8.4
+	go.mongodb.org/mongo-driver v1.9.0
 	google.golang.org/protobuf v1.28.0
 )`
 

codegen/tml/server/xweb/template_xweb.go

@@ -29,6 +29,7 @@ var s *web.WebServer
 func StartWebServer() {
 	c := config.GetWebServerConfig()
 	webc := &web.ServerConfig{
+		CloseMode:          c.CloseMode,
 		ConnectTimeout:     time.Duration(c.ConnectTimeout),
 		GlobalTimeout:      time.Duration(c.GlobalTimeout),
 		IdleTimeout:        time.Duration(c.IdleTimeout),

web/server.go

@@ -32,9 +32,14 @@ import (
 type OutsideHandler func(*Context)
 
 type ServerConfig struct {
-	//when server close,server will wait at least this time before close,every request will refresh the time
+	//when server close,server will wait at least this time before close
 	//min is 1 second
-	WaitCloseTime  time.Duration
+	WaitCloseTime time.Duration
+	//mode 0:must have no active requests and must wait at lease WaitCloseTime
+	//	every new request come in when the server is closing will refresh the WaitCloseTime
+	//mode 1:must have no active requests and must wait at lease WaitCloseTime
+	//	WaitCloseTime will not be refreshed by new requests
+	WaitCloseMode  int
 	ConnectTimeout time.Duration //max time for read the whole request,including the tls handshake
 	GlobalTimeout  time.Duration //request's max handling time
 	//if this is negative,it is same as disable keep alive,each request will take a new tcp connection,when request finish,tcp closed
@@ -454,8 +459,10 @@ func (s *WebServer) insideHandler(method, path string, handlers []OutsideHandler
 					break
 				}
 			} else {
-				//refresh close wait
-				s.closewaittimer.Reset(s.c.WaitCloseTime)
+				if s.c.WaitCloseMode == 0 {
+					//refresh close wait
+					s.closewaittimer.Reset(s.c.WaitCloseTime)
+				}
 				//tell peer self closed
 				w.Header().Set("Content-Type", "application/json")
 				w.WriteHeader(int(cerror.ErrClosing.Httpcode))