From 10950fa7cffff17c30d29e6e03f9acbae75184a8 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 30 Jun 2023 12:53:53 +0800 Subject: [PATCH 1/3] test: grpc add timeout --- pkg/discoveryregistry/zookeeper/resolver.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/discoveryregistry/zookeeper/resolver.go b/pkg/discoveryregistry/zookeeper/resolver.go index 50e01f218..c973d67a0 100644 --- a/pkg/discoveryregistry/zookeeper/resolver.go +++ b/pkg/discoveryregistry/zookeeper/resolver.go @@ -2,6 +2,7 @@ package zookeeper import ( "context" + "fmt" "strings" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" @@ -19,6 +20,7 @@ type Resolver struct { func (r *Resolver) ResolveNowZK(o resolver.ResolveNowOptions) { log.ZDebug(context.Background(), "start resolve now", "target", r.target, "cc", r.cc.UpdateState, "serviceName", strings.TrimLeft(r.target.URL.Path, "/")) + fmt.Println("start resolve now", "target", r.target, "cc", r.cc.UpdateState, "serviceName", strings.TrimLeft(r.target.URL.Path, "/")) newConns, err := r.getConnsRemote(strings.TrimLeft(r.target.URL.Path, "/")) if err != nil { log.ZError(context.Background(), "resolve now error", err, "target", r.target) @@ -37,7 +39,7 @@ func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) {} func (s *Resolver) Close() {} func (s *ZkClient) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) { - //s.logger.Printf("build resolver: %+v, cc: %+v", "target", target, "cc", cc.UpdateState()) + s.logger.Printf("build resolver: %+v, cc: %+v", target, cc.UpdateState) log.ZDebug(context.Background(), "build resolver start", "target", target, "cc", cc.UpdateState) r := &Resolver{} r.target = target @@ -48,7 +50,7 @@ func (s *ZkClient) Build(target resolver.Target, cc resolver.ClientConn, opts re defer s.lock.Unlock() serviceName := strings.TrimLeft(target.URL.Path, "/") s.resolvers[serviceName] = r - s.logger.Printf("build resolver finished: %+v, cc: %+v, key: ", target, cc, serviceName) + s.logger.Printf("build resolver finished: %+v, cc: %+v, key: %s", target, cc.UpdateState, serviceName) log.ZDebug(context.Background(), "build resolver finished", "target", target, "cc", cc.UpdateState, "serviceName", serviceName) return r, nil } From 87ad8b7f6811c75ceb2e0bbd1497e4246288f3d8 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 30 Jun 2023 13:13:06 +0800 Subject: [PATCH 2/3] api call user once --- internal/api/route.go | 8 ++++---- internal/api/user.go | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/internal/api/route.go b/internal/api/route.go index 67bd75f73..b24aa82c9 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -2,6 +2,7 @@ package api import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/mw" @@ -27,6 +28,7 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive } log.ZInfo(context.Background(), "load config", "config", config.Config) r.Use(gin.Recovery(), mw.CorsHandler(), mw.GinParseOperationID()) + u := NewUserApi(discov) if config.Config.Prometheus.Enable { prome.NewApiRequestCounter() prome.NewApiRequestFailedCounter() @@ -36,7 +38,6 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive } userRouterGroup := r.Group("/user") { - u := NewUserApi(discov) userRouterGroupChild := mw.NewRouterGroup(userRouterGroup, "") userRouterGroupChildToken := mw.NewRouterGroup(userRouterGroup, "", mw.WithGinParseToken(rdb)) userRouterGroupChild.POST("/user_register", u.UserRegister) @@ -105,7 +106,6 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive authRouterGroup := r.Group("/auth") { a := NewAuthApi(discov) - u := NewUserApi(discov) authRouterGroupChild := mw.NewRouterGroup(authRouterGroup, "") authRouterGroupChildToken := mw.NewRouterGroup(authRouterGroup, "", mw.WithGinParseToken(rdb)) authRouterGroupChild.POST("/user_register", u.UserRegister) //1 @@ -173,9 +173,9 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive statisticsGroup := r.Group("/statistics") { - s := NewStatisticsApi(discov) + // s := NewStatisticsApi(discov) conversationGroup.Use(mw.GinParseToken(rdb)) - statisticsGroup.POST("/user_register", s.UserRegister) + statisticsGroup.POST("/user_register", u.UserRegisterCount) } return r } diff --git a/internal/api/user.go b/internal/api/user.go index ba3b6f59f..18411ec2a 100644 --- a/internal/api/user.go +++ b/internal/api/user.go @@ -57,3 +57,7 @@ func (u *UserApi) GetUsersOnlineStatus(c *gin.Context) { return } } + +func (s *UserApi) UserRegisterCount(c *gin.Context) { + a2r.Call(user.UserClient.UserRegisterCount, s.Client, c) +} From 4916753c58f09092d12c30f28d28a89416d9adcc Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 30 Jun 2023 14:26:56 +0800 Subject: [PATCH 3/3] test: grpc add timeout --- config/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.yaml b/config/config.yaml index c3c9282c8..b4f20808a 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -98,7 +98,7 @@ object: externalId: roleSessionName: -rpcPort: #rpc服务端口，不建议修改，端口由脚本读取后传入程序，如启动多个程序，只需要填入多个端口，用逗号隔开，如 openImUserPort: [10110, 10111] +rpcPort: #rpc服务端口，不建议修改，端口由脚本读取后传入程序，如启动多个程序，只需要填入多个端口，用逗号隔开，如 [10110, 10111] openImUserPort: [ 10110 ] openImFriendPort: [ 10120 ] openImMessagePort: [ 10130 ]