From 2cd1af13bc4e7aec4c85b9fe88db2d294af6468f Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期日, 08 十月 2023 11:24:37 +0800
Subject: [PATCH] 修复集群同步功能
---
system-service/main.go | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/system-service/main.go b/system-service/main.go
index eebb524..8e6fd0a 100644
--- a/system-service/main.go
+++ b/system-service/main.go
@@ -3,13 +3,13 @@
import (
"context"
"flag"
- "net/http"
+ "fmt"
_ "net/http/pprof"
"os"
"os/signal"
"syscall"
"vamicro/config"
- "vamicro/extend/util"
+ //"vamicro/extend/util"
"vamicro/system-service/broadcast"
"vamicro/system-service/controllers"
"vamicro/system-service/models"
@@ -61,14 +61,14 @@
Proc: *proc,
Channel: nil,
PubTopic: pubTopics,
- SubTopic: []string{versionControlS.AuthorizationUpdateTopic},
+ SubTopic: []string{versionControlS.AuthorizationUpdateTopic, "sync-proc-message-to-serf"},
SubNetTopic: []string{},
}
q := make(chan os.Signal, 1)
signal.Notify(q, os.Interrupt, os.Kill, syscall.SIGTERM)
- ms, err := bhomeclient.NewMicroNode(ctx, q, config.Server.AnalyServerId, reg, logger.Debug)
+ ms, err := bhomeclient.NewMicroNode(ctx, q, config.Server.AnalyServerId, reg, nil)
if err != nil {
return
}
@@ -77,20 +77,24 @@
bhomedbapi.InitDoReq(ms.RequestOnly)
bhomedbapi.InitLog(logger.Debug)
- util.AuthCheck(ctx) //鎺堟潈妫�鏌�
+ //util.AuthCheck(ctx) //鎺堟潈妫�鏌�
+
go ms.StartServer(fm)
go dealSubMsg(ctx, ms)
+
serf.InitBusH(ms)
serf.InitAgent(ctx)
- go service.WatchEsAndWeedfsIp(ms)
+ //go service.WatchEsAndWeedfsIp(ms)
go serf.StartSyncSqlToSerf()
- go service.StartSyncDev()
+ //go service.StartSyncDev()
+
go broadcast.StartServer() //璁惧鍙互琚箍鎾悳绱�
+
//go service.CollectDeviceInfo(ctx, ms)
- go service.WatchAuthSetChange(ms) //鏍规嵁鎺堟潈鏂囦欢鐩戣閫氶亾鏁伴噺鍙樺寲
+ //go service.WatchAuthSetChange(ms) //鏍规嵁鎺堟潈鏂囦欢鐩戣閫氶亾鏁伴噺鍙樺寲
//缁熻绯荤粺杩愯鐘舵��
go sys.GatherStat()
@@ -152,6 +156,7 @@
funcMap[urlPrefix+"/sysset/getWifiList"] = ssController.GetWifiList
funcMap[urlPrefix+"/sysset/getDefKeyboardLayout"] = ssController.GetDefKeyboardLayout
funcMap[urlPrefix+"/sysset/connectWifi"] = ssController.ConnectWifi
+ funcMap[urlPrefix+"/sysset/disconnectWifi"] = ssController.DisonnectWifi
funcMap[urlPrefix+"/sysset/getSysSetting"] = ssController.GetSysSetting
funcMap[urlPrefix+"/sysset/updateSysSetting"] = ssController.UpdateSysSetting
funcMap[urlPrefix+"/sysset/freedisk"] = ssController.DiskInfo
@@ -174,6 +179,7 @@
funcMap[urlPrefix+"/cluster/updateClusterName"] = clusterController.UpdateClusterName
funcMap[urlPrefix+"/cluster/leave"] = clusterController.Leave
funcMap[urlPrefix+"/cluster/findIpByNode"] = clusterController.FindIpByNode
+ funcMap[urlPrefix+"/cluster/status"] = clusterController.GetClusterStat
sysMenuC := new(controllers.SysMenuController)
funcMap["/data/api-u/sysmenus/tree"] = sysMenuC.MenuTree
@@ -267,11 +273,13 @@
for key, _ := range funcMap {
pubTopics = append(pubTopics, key)
}
+
return funcMap, pubTopics
}
// 娴嬭瘯鎺ユ敹鍏ㄧ綉娑堟伅
func dealSubMsg(ctx context.Context, ms *bhomeclient.MicroNode) {
+ fmt.Println("dealSubMsg")
for {
select {
case <-ctx.Done():
--
Gitblit v1.8.0