添加监听配置自动重连逻辑

jsn4ke · jsn4ke · commit af12d7e4ef45 · 2024-01-07T23:36:36.000+08:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -35,6 +35,17 @@
                 "^TestRpcLogicReSubscribeAsk$",
                 "./internal/rpc",
             ],
-        }
+        },
+        {
+            "name": "Launch chat pusher",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/cmd/chat-pusher",
+            "buildFlags": [
+                "-race",
+            ],
+            "args": [],
+        },
     ]
 }
diff --git a/cmd/chat-auth/main.go b/cmd/chat-auth/main.go
@@ -0,0 +1,18 @@
+package main
+
+import (
+	"flag"
+
+	"github.com/jsn4ke/chat/internal/rpc"
+	jsn_rpc "github.com/jsn4ke/jsn_net/rpc"
+)
+
+var (
+	authAddr = flag.String("addr", "", "")
+)
+
+func main() {
+	flag.Parse()
+	svr := jsn_rpc.NewServer(*authAddr, 128, 4)
+	rpc.NewRpcAuthServer(svr, 4, make(<-chan struct{})).Run()
+}
diff --git a/cmd/chat-gateway/main.go b/cmd/chat-gateway/main.go
@@ -0,0 +1,39 @@
+package main
+
+import (
+	"flag"
+	"os"
+
+	"github.com/jsn4ke/chat/internal/cluster"
+	"github.com/jsn4ke/chat/internal/gateway"
+	"github.com/jsn4ke/chat/internal/rpc"
+	"github.com/redis/go-redis/v9"
+)
+
+var (
+	addr    = flag.String("addr", "", "")
+	rpcAddr = flag.String("rpcaddr", "", "")
+
+	Addr     = os.Getenv("REDIS_ADDR")
+	Password = os.Getenv("REDIS_PSW")
+)
+
+func main() {
+	flag.Parse()
+
+	rdb := redis.NewClient(&redis.Options{
+		Addr:     Addr,
+		Password: Password,
+	})
+
+	auth := cluster.NewRpcAuthCliCluster(rdb)
+	logic := cluster.NewRpcLogicCliCluster(rdb)
+
+	gateway.NewGateway(1, *addr, *rpcAddr, make(<-chan struct{}),
+		auth,
+		logic,
+		rpc.NewRpcGatewaySvrWrap,
+	)
+
+	select {}
+}
diff --git a/cmd/chat-logic/main.go b/cmd/chat-logic/main.go
@@ -0,0 +1,37 @@
+package main
+
+import (
+	"flag"
+	"os"
+
+	"github.com/jsn4ke/chat/internal/cluster"
+	"github.com/jsn4ke/chat/internal/rpc"
+	jsn_rpc "github.com/jsn4ke/jsn_net/rpc"
+	"github.com/redis/go-redis/v9"
+)
+
+var (
+	logicAddr = flag.String("addr", "", "")
+
+	Addr     = os.Getenv("REDIS_ADDR")
+	Password = os.Getenv("REDIS_PSW")
+)
+
+func main() {
+	flag.Parse()
+
+	rdb := redis.NewClient(&redis.Options{
+		Addr:     Addr,
+		Password: Password,
+	})
+	svr := jsn_rpc.NewServer(*logicAddr, 128, 4)
+
+	pusher := cluster.NewRpcPusherCliCluster(rdb)
+	gateway := cluster.NewRpcGatewayCliCluster(rdb)
+
+	rpc.NewRpcLogicServer(svr, 20, make(<-chan struct{}),
+		pusher,
+		gateway,
+		rdb,
+	).Run()
+}
diff --git a/cmd/chat-pusher/main.go b/cmd/chat-pusher/main.go
@@ -0,0 +1,30 @@
+package main
+
+import (
+	"flag"
+	"os"
+	"time"
+
+	"github.com/jsn4ke/chat/internal/cluster"
+	"github.com/jsn4ke/chat/internal/rpc"
+	jsn_rpc "github.com/jsn4ke/jsn_net/rpc"
+	"github.com/redis/go-redis/v9"
+)
+
+var (
+	pushAddr = flag.String("addr", "", "")
+
+	Addr     = os.Getenv("REDIS_ADDR")
+	Password = os.Getenv("REDIS_PSW")
+)
+
+func main() {
+	flag.Parse()
+	rdb := redis.NewClient(&redis.Options{
+		Addr:     Addr,
+		Password: Password,
+	})
+	gateway := cluster.NewRpcGatewayCliCluster(rdb)
+	svr := jsn_rpc.NewServer(*pushAddr, 128, 4)
+	rpc.NewRpcPusherSvr(svr, 4, make(<-chan struct{}), rdb, gateway, time.Millisecond*10).Run()
+}
diff --git a/cmd/mock-client/main.go b/cmd/mock-client/main.go
@@ -17,7 +17,7 @@ import (
 )
 
 var (
-	gatewayAddr = "127.0.0.1:10001"
+	gatewayAddr = "127.0.0.1:14001"
 )
 
 var (
diff --git a/cmd/mock-gateway/main.go b/cmd/mock-gateway/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"net/http"
 	_ "net/http/pprof"
 	"os"
@@ -115,6 +116,7 @@ var (
 )
 
 func newRpcLogicServer() {
+	fmt.Println("==", Addr, Password)
 	rdb := redis.NewClient(&redis.Options{
 		Addr:     Addr,
 		Password: Password,
@@ -136,6 +138,7 @@ func newRpcAuthServer() {
 }
 
 func newRpcPushServer() {
+	fmt.Println(Addr, Password)
 	rdb := redis.NewClient(&redis.Options{
 		Addr:     Addr,
 		Password: Password,
diff --git a/go.mod b/go.mod
@@ -5,8 +5,10 @@ go 1.21.5
 require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
-	github.com/jsn4ke/jsn_net v0.0.8 // indirect
+	github.com/jsn4ke/jsn_net v0.0.10 // indirect
 	github.com/redis/go-redis/v9 v9.3.1 // indirect
+	golang.org/x/sys v0.16.0 // indirect
 	google.golang.org/protobuf v1.32.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -2,6 +2,8 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
 github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/jsn4ke/jsn_net v0.0.2 h1:7yLLP7/pKk2hSg2gmh0HRatgeK626CHhbO0lEgzgwKo=
@@ -18,7 +20,13 @@ github.com/jsn4ke/jsn_net v0.0.7 h1:jIA66Es6BpXYA7G744T7gvLcErrFbovCLb4rNx/K3tI=
 github.com/jsn4ke/jsn_net v0.0.7/go.mod h1:F2BO8Zw7E5uzl9Vd9gBJxb4mkO0f6j5vD76lvGPkQ9k=
 github.com/jsn4ke/jsn_net v0.0.8 h1:Hv9PpxSCY76quTS3One1LKGuVq9b33Tw026QZU/J4Rk=
 github.com/jsn4ke/jsn_net v0.0.8/go.mod h1:F2BO8Zw7E5uzl9Vd9gBJxb4mkO0f6j5vD76lvGPkQ9k=
+github.com/jsn4ke/jsn_net v0.0.9 h1:maqVnYfqeqDuvKju2FlvfIK8rpCgBYK7P3+2+Q8+dF4=
+github.com/jsn4ke/jsn_net v0.0.9/go.mod h1:F2BO8Zw7E5uzl9Vd9gBJxb4mkO0f6j5vD76lvGPkQ9k=
+github.com/jsn4ke/jsn_net v0.0.10 h1:VbQ8RKEt1XAsnZ9HFq6bGzh3uqQVrMVcDaeZg/Rqzkg=
+github.com/jsn4ke/jsn_net v0.0.10/go.mod h1:F2BO8Zw7E5uzl9Vd9gBJxb4mkO0f6j5vD76lvGPkQ9k=
 github.com/redis/go-redis/v9 v9.3.1 h1:KqdY8U+3X6z+iACvumCNxnoluToB+9Me+TvyFa21Mds=
 github.com/redis/go-redis/v9 v9.3.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
 google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
diff --git a/internal/cluster/cluster.go b/internal/cluster/cluster.go
diff --git a/internal/cluster/cluster_test.go b/internal/cluster/cluster_test.go
diff --git a/internal/inter/cluster.go b/internal/inter/cluster.go

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`var (`
`20`		`- gatewayAddr = "127.0.0.1:10001"`
	`20`	`+ gatewayAddr = "127.0.0.1:14001"`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`var (`