You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2023/02/14 12:58:02 UTC
[servicecomb-service-center] 01/01: [fix] syncer init failed
This is an automated email from the ASF dual-hosted git repository.
littlecui pushed a commit to branch mod
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
commit b4aa616c8376d3c3cc17123d44c9667bdd79daa9
Author: little-cui <su...@qq.com>
AuthorDate: Tue Feb 14 20:57:19 2023 +0800
[fix] syncer init failed
---
server/core/core.go | 3 ++-
server/init/init.go | 2 +-
server/pubsub/ws/websocket_test.go | 2 +-
server/server.go | 9 ---------
server/service/heartbeat/websocket_test.go | 2 +-
syncer/server/server.go | 9 ++++++++-
6 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/server/core/core.go b/server/core/core.go
index ed8e2d1d..67db1d6c 100644
--- a/server/core/core.go
+++ b/server/core/core.go
@@ -46,7 +46,8 @@ const (
defaultCollectPeriod = 30 * time.Second
)
-func Initialize() {
+// Init init chassis and sc configs
+func Init() {
if err := chassis.Init(); err != nil {
log.Warn(err.Error())
}
diff --git a/server/init/init.go b/server/init/init.go
index 9e0ea3eb..1154e053 100644
--- a/server/init/init.go
+++ b/server/init/init.go
@@ -20,5 +20,5 @@ package init
import "github.com/apache/servicecomb-service-center/server/core"
func init() {
- core.Initialize()
+ core.Init()
}
diff --git a/server/pubsub/ws/websocket_test.go b/server/pubsub/ws/websocket_test.go
index deb1d190..aa455eb3 100644
--- a/server/pubsub/ws/websocket_test.go
+++ b/server/pubsub/ws/websocket_test.go
@@ -37,7 +37,7 @@ var closeCh = make(chan struct{})
func init() {
testing.Init()
- core.Initialize()
+ core.Init()
}
type watcherConn struct {
diff --git a/server/server.go b/server/server.go
index ca3c0afa..cf996801 100644
--- a/server/server.go
+++ b/server/server.go
@@ -24,8 +24,6 @@ import (
"github.com/apache/servicecomb-service-center/server/middleware"
"github.com/apache/servicecomb-service-center/server/resource/disco"
- syncv1 "github.com/apache/servicecomb-service-center/syncer/api/v1"
- "github.com/apache/servicecomb-service-center/syncer/rpc"
"github.com/gofiber/fiber/v2"
"github.com/go-chassis/go-chassis/v2"
@@ -43,7 +41,6 @@ import (
"github.com/apache/servicecomb-service-center/server/plugin/security/tlsconf"
"github.com/apache/servicecomb-service-center/server/service/grc"
"github.com/apache/servicecomb-service-center/server/service/rbac"
- syncConfig "github.com/apache/servicecomb-service-center/syncer/config"
"github.com/go-chassis/foundation/gopool"
)
@@ -82,12 +79,6 @@ func (s *ServiceCenterServer) Run() {
func (s *ServiceCenterServer) startChassis() {
go func() {
mask := make([]string, 0)
- if !syncConfig.GetConfig().Sync.EnableOnStart {
- mask = append(mask, "grpc")
- } else {
- chassis.RegisterSchema("grpc", &rpc.Server{},
- chassisServer.WithRPCServiceDesc(&syncv1.EventService_ServiceDesc))
- }
if !config.GetBool("server.turbo", false) {
log.Info("turbo is disabled")
mask = append(mask, "rest")
diff --git a/server/service/heartbeat/websocket_test.go b/server/service/heartbeat/websocket_test.go
index 926d526d..21de3155 100644
--- a/server/service/heartbeat/websocket_test.go
+++ b/server/service/heartbeat/websocket_test.go
@@ -37,7 +37,7 @@ var closeCh = make(chan struct{})
func init() {
testing.Init()
- core.Initialize()
+ core.Init()
}
type watcherConn struct {
diff --git a/syncer/server/server.go b/syncer/server/server.go
index 62e07580..b9873dbe 100644
--- a/syncer/server/server.go
+++ b/syncer/server/server.go
@@ -19,14 +19,19 @@ package server
import (
"github.com/apache/servicecomb-service-center/pkg/log"
+ syncv1 "github.com/apache/servicecomb-service-center/syncer/api/v1"
"github.com/apache/servicecomb-service-center/syncer/config"
"github.com/apache/servicecomb-service-center/syncer/metrics"
+ "github.com/apache/servicecomb-service-center/syncer/rpc"
"github.com/apache/servicecomb-service-center/syncer/service/sync"
+ "github.com/go-chassis/go-chassis/v2"
+ chassisServer "github.com/go-chassis/go-chassis/v2/core/server"
// kie db
_ "github.com/apache/servicecomb-kie/server/datasource/etcd"
)
+// Run register chassis schema and run syncer services before chassis.Run()
func Run() {
if err := config.Init(); err != nil {
log.Error("syncer config init failed", err)
@@ -37,10 +42,12 @@ func Run() {
return
}
+ chassis.RegisterSchema("grpc", rpc.NewServer(),
+ chassisServer.WithRPCServiceDesc(&syncv1.EventService_ServiceDesc))
+
sync.Init()
if err := metrics.Init(); err != nil {
log.Error("syncer metrics init failed", err)
}
-
}