From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
main.go | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/main.go b/main.go
index ceb0a08..39420ab 100644
--- a/main.go
+++ b/main.go
@@ -2,6 +2,7 @@
import (
"apsClient/conf"
+ "apsClient/constvar"
"apsClient/crontask"
"apsClient/model"
"apsClient/nsq"
@@ -9,10 +10,11 @@
"apsClient/pkg/sqlitex"
"apsClient/router"
"apsClient/serf"
- "apsClient/service/plc_address"
+ "apsClient/service"
"fmt"
"log"
"net/http"
+ _ "net/http/pprof"
"time"
)
@@ -27,7 +29,7 @@
}
//鍔犺浇plc鍐欏叆鍦板潃
- plc_address.LoadAddressFromFile()
+ //plc_address.LoadAddressFromFile()
// 鍚姩鏁版嵁鍚屾
var serfStartChan = make(chan bool)
@@ -39,21 +41,40 @@
"production_progress",
"work_order",
"task_status_sync",
+ "device",
+ "device_plc",
+ "system_status",
+ "process_model_plc_address",
+ "reports_to_cloud",
+ "report_work",
}
agent := serf.InitAgent("apsClient", syncTables, sqlitex.GetDB())
agent.RegisterClusterEvent(serfClusterEvent)
go agent.Serve(serfStartChan)
- <-serfStartChan
- //if !<-serfStartChan {
- // logx.Errorf("serf Init err, exit")
- // return
- //}
+ if !<-serfStartChan {
+ logx.Errorf("serf Init err, exit")
+ return
+ }
+
+ //浠庢枃浠堕噷璇诲彇褰撳墠鐢熶骇璁惧id鑾峰彇璁惧鍒楄〃绗竴涓�
+ err := service.InitCurrentDeviceID(serf.Vasystem.ServerID)
+ if err != nil {
+ logx.Errorf("InitCurrentDeviceID error: %v, exit", err)
+ return
+ }
+
+ go func() {
+ service.ReportsSystemDeviceToCloud(serf.Vasystem.ServerID)
+ }()
// 鍒ゆ柇褰撳墠闆嗙兢鐘舵��
logx.Infof("current agent.ClusterStatus:%v", agent.ClusterStatus)
log.Println("current agent.ClusterStatus:", agent.ClusterStatus)
+
+ conf.Conf.SerfClusterStatus = agent.ClusterStatus
+
if agent.ClusterStatus != "slave" {
if err := nsq.Init(); err != nil {
logx.Errorf("nsq Init err:%v", err)
@@ -78,6 +99,7 @@
}
func serfClusterEvent(stat int) {
+ ChangeClusterStatus(stat)
switch stat {
case serf.EventCreateCluster, serf.EventSlave2Master, serf.EventLeaveCluster:
if err := nsq.Init(); err != nil { //寮�鍚痭sq
@@ -100,3 +122,14 @@
logx.Infof("serf cluster event: %v", stat)
}
+
+func ChangeClusterStatus(stat int) {
+ switch stat {
+ case serf.EventSlave2Master, serf.EventCreateCluster:
+ conf.Conf.SerfClusterStatus = constvar.SerfClusterStatusMaster
+ case serf.EventLeaveCluster:
+ conf.Conf.SerfClusterStatus = constvar.SerfClusterStatusNull
+ case serf.EventJoinCluster, serf.EventMaster2Slave:
+ conf.Conf.SerfClusterStatus = constvar.SerfClusterStatusSlave
+ }
+}
--
Gitblit v1.8.0