refactor: merge upstream code

chuntaojun · Oct 27, 2021 · 42ce59a · 42ce59a
2 parents 0e6212f + bf4d803
commit 42ce59a
Show file tree

Hide file tree

Showing 18 changed files with 1,213 additions and 82 deletions.
diff --git a/apiserver/grpcserver/server.go b/apiserver/grpcserver/server.go
@@ -108,6 +108,17 @@ func (g *GRPCServer) Run(errCh chan error) {
 		g.start = false
 	}()
 
+	var err error
+	// 引入功能模块和插件
+	g.namingServer, err = naming.GetServer()
+	if err != nil {
+		log.Errorf("%v", err)
+		errCh <- err
+		return
+	}
+	g.statis = plugin.GetStatis()
+
+	//初始化grpc server
 	address := fmt.Sprintf("%v:%v", g.listenIP, g.listenPort)
 	listener, err := net.Listen("tcp", address)
 	if err != nil {
@@ -155,15 +166,6 @@ func (g *GRPCServer) Run(errCh chan error) {
 	}
 	g.server = server
 
-	// 引入功能模块和插件
-	g.namingServer, err = naming.GetServer()
-	if err != nil {
-		log.Errorf("%v", err)
-		errCh <- err
-		return
-	}
-	g.statis = plugin.GetStatis()
-
 	if err := server.Serve(listener); err != nil {
 		log.Errorf("%v", err)
 		errCh <- err