modify timeout settings

Author: zhufuyi

cmd/protoc-gen-go-rpc-tmpl/internal/generate/service/template.go

@@ -263,7 +263,7 @@ import (
 func Test_service_{{.LowerName}}_methods(t *testing.T) {
 	conn := getRPCClientConnForTest()
 	cli := serverNameExampleV1.New{{.Name}}Client(conn)
-	ctx, _ := context.WithTimeout(context.Background(), time.Second*5)
+	ctx := context.Background()
 
 	tests := []struct {
 		name    string

cmd/serverNameExample_grpcExample/initial/createService.go

@@ -3,7 +3,6 @@ package initial
 import (
 	"fmt"
 	"strconv"
-	"time"
 
 	"github.com/zhufuyi/sponge/pkg/app"
 	"github.com/zhufuyi/sponge/pkg/logger"
@@ -25,8 +24,6 @@ func CreateServices() []app.IServer {
 	grpcAddr := ":" + strconv.Itoa(cfg.Grpc.Port)
 	grpcRegistry, grpcInstance := registerService("grpc", cfg.App.Host, cfg.Grpc.Port)
 	grpcServer := server.NewGRPCServer(grpcAddr,
-		server.WithGrpcReadTimeout(time.Duration(cfg.Grpc.ReadTimeout)*time.Second),
-		server.WithGrpcWriteTimeout(time.Duration(cfg.Grpc.WriteTimeout)*time.Second),
 		server.WithGrpcRegistry(grpcRegistry, grpcInstance),
 	)
 	servers = append(servers, grpcServer)

cmd/serverNameExample_grpcGwPbExample/initial/createService.go

@@ -3,7 +3,6 @@ package initial
 import (
 	"fmt"
 	"strconv"
-	"time"
 
 	"github.com/zhufuyi/sponge/pkg/app"
 	"github.com/zhufuyi/sponge/pkg/logger"
@@ -25,8 +24,6 @@ func CreateServices() []app.IServer {
 	httpAddr := ":" + strconv.Itoa(cfg.HTTP.Port)
 	httpRegistry, httpInstance := registerService("http", cfg.App.Host, cfg.HTTP.Port)
 	httpServer := server.NewHTTPServer_pbExample(httpAddr,
-		server.WithHTTPReadTimeout(time.Second*time.Duration(cfg.HTTP.ReadTimeout)),
-		server.WithHTTPWriteTimeout(time.Second*time.Duration(cfg.HTTP.WriteTimeout)),
 		server.WithHTTPRegistry(httpRegistry, httpInstance),
 		server.WithHTTPIsProd(cfg.App.Env == "prod"),
 	)

cmd/serverNameExample_grpcHttpPbExample/initial/createService.go

@@ -3,7 +3,6 @@ package initial
 import (
 	"fmt"
 	"strconv"
-	"time"
 
 	"github.com/zhufuyi/sponge/pkg/app"
 	"github.com/zhufuyi/sponge/pkg/logger"
@@ -25,8 +24,6 @@ func CreateServices() []app.IServer {
 	httpAddr := ":" + strconv.Itoa(cfg.HTTP.Port)
 	httpRegistry, httpInstance := registerService("http", cfg.App.Host, cfg.HTTP.Port)
 	httpServer := server.NewHTTPServer(httpAddr,
-		server.WithHTTPReadTimeout(time.Second*time.Duration(cfg.HTTP.ReadTimeout)),
-		server.WithHTTPWriteTimeout(time.Second*time.Duration(cfg.HTTP.WriteTimeout)),
 		server.WithHTTPRegistry(httpRegistry, httpInstance),
 		server.WithHTTPIsProd(cfg.App.Env == "prod"),
 	)
@@ -36,8 +33,6 @@ func CreateServices() []app.IServer {
 	grpcAddr := ":" + strconv.Itoa(cfg.Grpc.Port)
 	grpcRegistry, grpcInstance := registerService("grpc", cfg.App.Host, cfg.Grpc.Port)
 	grpcServer := server.NewGRPCServer(grpcAddr,
-		server.WithGrpcReadTimeout(time.Duration(cfg.Grpc.ReadTimeout)*time.Second),
-		server.WithGrpcWriteTimeout(time.Duration(cfg.Grpc.WriteTimeout)*time.Second),
 		server.WithGrpcRegistry(grpcRegistry, grpcInstance),
 	)
 	servers = append(servers, grpcServer)

cmd/serverNameExample_grpcPbExample/initial/createService.go

@@ -3,7 +3,6 @@ package initial
 import (
 	"fmt"
 	"strconv"
-	"time"
 
 	"github.com/zhufuyi/sponge/pkg/app"
 	"github.com/zhufuyi/sponge/pkg/logger"
@@ -25,8 +24,6 @@ func CreateServices() []app.IServer {
 	grpcAddr := ":" + strconv.Itoa(cfg.Grpc.Port)
 	grpcRegistry, grpcInstance := registerService("grpc", cfg.App.Host, cfg.Grpc.Port)
 	grpcServer := server.NewGRPCServer(grpcAddr,
-		server.WithGrpcReadTimeout(time.Duration(cfg.Grpc.ReadTimeout)*time.Second),
-		server.WithGrpcWriteTimeout(time.Duration(cfg.Grpc.WriteTimeout)*time.Second),
 		server.WithGrpcRegistry(grpcRegistry, grpcInstance),
 	)
 	servers = append(servers, grpcServer)

cmd/serverNameExample_httpExample/initial/createService.go

@@ -3,7 +3,6 @@ package initial
 import (
 	"fmt"
 	"strconv"
-	"time"
 
 	"github.com/zhufuyi/sponge/pkg/app"
 	"github.com/zhufuyi/sponge/pkg/logger"
@@ -25,8 +24,6 @@ func CreateServices() []app.IServer {
 	httpAddr := ":" + strconv.Itoa(cfg.HTTP.Port)
 	httpRegistry, httpInstance := registerService("http", cfg.App.Host, cfg.HTTP.Port)
 	httpServer := server.NewHTTPServer(httpAddr,
-		server.WithHTTPReadTimeout(time.Second*time.Duration(cfg.HTTP.ReadTimeout)),
-		server.WithHTTPWriteTimeout(time.Second*time.Duration(cfg.HTTP.WriteTimeout)),
 		server.WithHTTPRegistry(httpRegistry, httpInstance),
 		server.WithHTTPIsProd(cfg.App.Env == "prod"),
 	)

cmd/serverNameExample_httpPbExample/initial/createService.go

@@ -3,7 +3,6 @@ package initial
 import (
 	"fmt"
 	"strconv"
-	"time"
 
 	"github.com/zhufuyi/sponge/pkg/app"
 	"github.com/zhufuyi/sponge/pkg/logger"
@@ -25,8 +24,6 @@ func CreateServices() []app.IServer {
 	httpAddr := ":" + strconv.Itoa(cfg.HTTP.Port)
 	httpRegistry, httpInstance := registerService("http", cfg.App.Host, cfg.HTTP.Port)
 	httpServer := server.NewHTTPServer_pbExample(httpAddr,
-		server.WithHTTPReadTimeout(time.Second*time.Duration(cfg.HTTP.ReadTimeout)),
-		server.WithHTTPWriteTimeout(time.Second*time.Duration(cfg.HTTP.WriteTimeout)),
 		server.WithHTTPRegistry(httpRegistry, httpInstance),
 		server.WithHTTPIsProd(cfg.App.Env == "prod"),
 	)

cmd/serverNameExample_mixExample/initial/createService.go

@@ -3,7 +3,6 @@ package initial
 import (
 	"fmt"
 	"strconv"
-	"time"
 
 	"github.com/zhufuyi/sponge/pkg/app"
 	"github.com/zhufuyi/sponge/pkg/logger"
@@ -25,8 +24,6 @@ func CreateServices() []app.IServer {
 	httpAddr := ":" + strconv.Itoa(cfg.HTTP.Port)
 	httpRegistry, httpInstance := registerService("http", cfg.App.Host, cfg.HTTP.Port)
 	httpServer := server.NewHTTPServer(httpAddr,
-		server.WithHTTPReadTimeout(time.Second*time.Duration(cfg.HTTP.ReadTimeout)),
-		server.WithHTTPWriteTimeout(time.Second*time.Duration(cfg.HTTP.WriteTimeout)),
 		server.WithHTTPRegistry(httpRegistry, httpInstance),
 		server.WithHTTPIsProd(cfg.App.Env == "prod"),
 	)
@@ -36,8 +33,6 @@ func CreateServices() []app.IServer {
 	grpcAddr := ":" + strconv.Itoa(cfg.Grpc.Port)
 	grpcRegistry, grpcInstance := registerService("grpc", cfg.App.Host, cfg.Grpc.Port)
 	grpcServer := server.NewGRPCServer(grpcAddr,
-		server.WithGrpcReadTimeout(time.Duration(cfg.Grpc.ReadTimeout)*time.Second),
-		server.WithGrpcWriteTimeout(time.Duration(cfg.Grpc.WriteTimeout)*time.Second),
 		server.WithGrpcRegistry(grpcRegistry, grpcInstance),
 	)
 	servers = append(servers, grpcServer)

cmd/sponge/commands/generate/template.go

@@ -392,7 +392,7 @@ func NewCenter(configFile string) (*Center, error) {
 	httpServerConfigCode = `# http server settings
 http:
   port: 8080                # listen port
-  timeout: 10               # request timeout, unit(second), if 0 means not set, if greater than 0 means set timeout, if enableHTTPProfile is true, it needs to set 0 or greater than 60s`
+  timeout: 0                # request timeout, unit(second), if 0 means not set, if greater than 0 means set timeout, if enableHTTPProfile is true, it needs to set 0 or greater than 60s`
 
 	rpcServerConfigCode = `# grpc server settings
 grpc:
@@ -415,6 +415,7 @@ grpcClient:
   - name: "your_grpc_service_name"    # grpc service name, used for service discovery
     host: "127.0.0.1"            # grpc service address, used for direct connection
     port: 8282                   # grpc service port
+    timeout: 0                   # request timeout, unit(second), if 0 means not set, if greater than 0 means set timeout, valid only for unary grpc type
     registryDiscoveryType: ""    # registration and discovery types: consul, etcd, nacos, if empty, connecting to server using host and port
     enableLoadBalance: true      # whether to turn on the load balancer
     # clientSecure parameter setting
@@ -435,14 +436,15 @@ grpcClient:
 	rpcGwServerConfigCode = `# http server settings
 http:
   port: 8080                # listen port
-  timeout: 10                # request timeout, unit(second), if 0 means not set, if greater than 0 means set timeout, if enableHTTPProfile is true, it needs to set 0 or greater than 60s
+  timeout: 0                 # request timeout, unit(second), if 0 means not set, if greater than 0 means set timeout, if enableHTTPProfile is true, it needs to set 0 or greater than 60s
 
 
 # grpc client-side settings, support for setting up multiple grpc clients.
 grpcClient:
   - name: "your_grpc_service_name"    # grpc service name, used for service discovery
     host: "127.0.0.1"            # grpc service address, used for direct connection
     port: 8282                   # grpc service port
+    timeout: 0                   # request timeout, unit(second), if 0 means not set, if greater than 0 means set timeout, valid only for unary grpc type
     registryDiscoveryType: ""    # registration and discovery types: consul, etcd, nacos, if empty, connecting to server using host and port
     enableLoadBalance: true      # whether to turn on the load balancer
     # clientSecure parameter setting
@@ -463,7 +465,7 @@ grpcClient:
 	grpcAndHTTPServerConfigCode = `# http server settings
 http:
   port: 8080                # listen port
-  timeout: 10               # request timeout, unit(second), if 0 means not set, if greater than 0 means set timeout, if enableHTTPProfile is true, it needs to set 0 or greater than 60s
+  timeout: 0                # request timeout, unit(second), if 0 means not set, if greater than 0 means set timeout, if enableHTTPProfile is true, it needs to set 0 or greater than 60s
 
 
 # grpc server settings
@@ -487,6 +489,7 @@ grpcClient:
   - name: "your_grpc_service_name"    # grpc service name, used for service discovery
     host: "127.0.0.1"            # grpc service address, used for direct connection
     port: 8282                   # grpc service port
+    timeout: 0                   # request timeout, unit(second), if 0 means not set, if greater than 0 means set timeout, valid only for unary grpc type
     registryDiscoveryType: ""    # registration and discovery types: consul, etcd, nacos, if empty, connecting to server using host and port
     enableLoadBalance: true      # whether to turn on the load balancer
     # clientSecure parameter setting

configs/serverNameExample.yml

@@ -22,16 +22,13 @@ app:
 # http server settings
 http:
   port: 8080                # listen port
-  readTimeout: 5            # read timeout, unit(second)
-  writeTimeout: 5           # write timeout, unit(second), if enableHTTPProfile is true, it needs to be greater than 60s, the default value for pprof to do profiling is 60s
+  timeout: 0                 # request timeout, unit(second), if 0 means not set, if greater than 0 means set timeout, if enableHTTPProfile is true, it needs to set 0 or greater than 60s
 
 
 # grpc server settings
 grpc:
   port: 8282                # listen port
   httpPort: 8283            # profile and metrics ports
-  readTimeout: 5            # read timeout, unit(second)
-  writeTimeout: 5           # write timeout, unit(second)
   enableToken: false        # whether to enable server-side token authentication, default appID=grpc, appKey=123456
   # serverSecure parameter setting
   # if type="", it means no secure connection, no need to fill in any parameters
@@ -49,6 +46,7 @@ grpcClient:
   - name: "serverNameExample"    # grpc service name, used for service discovery
     host: "127.0.0.1"            # grpc service address, used for direct connection
     port: 8282                   # grpc service port
+    timeout: 0                   # request timeout, unit(second), if 0 means not set, if greater than 0 means set timeout, valid only for unary grpc type
     registryDiscoveryType: ""    # registration and discovery types: consul, etcd, nacos, if empty, connecting to server using host and port
     enableLoadBalance: true         # whether to turn on the load balancer
     # clientSecure parameter setting