From cab6eea89a0d82710369604ecb51f1cdb122e433 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 17:26:34 +0800
Subject: [PATCH] fix
---
main.go | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/main.go b/main.go
index fbf0511..74d4c67 100644
--- a/main.go
+++ b/main.go
@@ -2,14 +2,16 @@
import (
"apsClient/conf"
+ "apsClient/crontask"
"apsClient/model"
+ "apsClient/nsq"
"apsClient/pkg/logx"
+ "apsClient/pkg/sqlitex"
"apsClient/router"
+ "apsClient/serf"
+ "apsClient/service/plc_address"
"fmt"
"net/http"
- "os"
- "os/signal"
- "syscall"
"time"
)
@@ -23,7 +25,39 @@
return
}
- go shutdown()
+ //鍔犺浇plc鍐欏叆鍦板潃
+ plc_address.LoadAddressFromFile()
+
+ // 鍚姩鏁版嵁鍚屾
+ var serfStartChan = make(chan bool)
+ // 闇�瑕佸悓姝ョ殑琛�
+ var syncTables = []string{
+ "procedures",
+ "process_model",
+ "production_progress",
+ "work_order",
+ "task_status_sync",
+ }
+
+ agent := serf.InitAgent("apsClient", syncTables, sqlitex.GetDB())
+ agent.RegisterClusterEvent(serfClusterEvent)
+ go agent.Serve(serfStartChan)
+ <-serfStartChan
+
+ // 鍒ゆ柇褰撳墠闆嗙兢鐘舵��
+ if agent.ClusterStatus != "slave" {
+ if err := nsq.Init(); err != nil {
+ logx.Errorf("nsq Init err:%v", err)
+ return
+ }
+
+ }
+ crontask.Once(agent.ClusterStatus != "slave")
+ if err := crontask.StartTask(agent.ClusterStatus != "slave"); err != nil {
+ logx.Errorf("crontab task Init err:%v", err)
+ return
+ }
+
logx.Infof("apsClient start serve...")
server := &http.Server{
Addr: fmt.Sprintf(":%d", conf.Conf.System.Port),
@@ -34,11 +68,26 @@
logx.Error(server.ListenAndServe().Error())
}
-func shutdown() {
- quit := make(chan os.Signal, 1)
- signal.Notify(quit, syscall.SIGKILL, syscall.SIGQUIT, syscall.SIGINT, syscall.SIGTERM)
- <-quit
+func serfClusterEvent(stat int) {
+ switch stat {
+ case serf.EventCreateCluster, serf.EventSlave2Master, serf.EventLeaveCluster:
+ if err := nsq.Init(); err != nil { //寮�鍚痭sq
+ logx.Errorf("nsq Init err:%v", err)
+ return
+ }
+ crontask.Once(true)
+ if err := crontask.RestartTask(true); err != nil { //浠aster鏂瑰紡閲嶅惎task
+ logx.Errorf("crontab task Init err:%v", err)
+ return
+ }
+ case serf.EventJoinCluster, serf.EventMaster2Slave:
+ nsq.Stop() //鍏抽棴nsq
+ crontask.Once(false)
+ if err := crontask.RestartTask(false); err != nil { //浠ラ潪master鏂瑰紡閲嶅惎task
+ logx.Errorf("crontab task Init err:%v", err)
+ return
+ }
+ }
- logx.Infof("apsClient exited...")
- os.Exit(0)
+ logx.Infof("serf cluster event: %v", stat)
}
--
Gitblit v1.8.0