From 10c65da3d2af7056f48d9301e83f53f102f76e18 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 30 十月 2023 14:52:11 +0800
Subject: [PATCH] fix
---
nsq/nsq.go | 82 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 14 deletions(-)
diff --git a/nsq/nsq.go b/nsq/nsq.go
index 2710e13..68274b2 100644
--- a/nsq/nsq.go
+++ b/nsq/nsq.go
@@ -3,39 +3,93 @@
import (
"apsClient/conf"
"apsClient/constvar"
- "apsClient/model/common"
"apsClient/pkg/logx"
+ "apsClient/pkg/nsqclient"
"apsClient/pkg/safe"
+ "context"
"errors"
"fmt"
- "time"
+ "sync"
+ "sync/atomic"
)
-func Init() error {
+type consumerManager struct {
+ ctx context.Context
+ clients sync.Map
+ initFlag int32
+}
+
+var defaultConsumerManager *consumerManager
+
+func init() {
+ defaultConsumerManager = new(consumerManager)
+}
+
+func (c *consumerManager) init() error {
if len(conf.Conf.NsqConf.NodeId) <= 0 {
return errors.New("no NodeId")
}
-
+ if !atomic.CompareAndSwapInt32(&c.initFlag, 0, 1) {
+ return nil
+ }
if err := initProducer(); err != nil {
return err
}
+ var topics = []string{
+ constvar.NsqTopicScheduleTask,
+ constvar.NsqTopicApsProcessParams,
+ constvar.NsqTopicDeviceUpdate,
+ constvar.NsqTopicPullDataResponse,
+ }
+ for _, t := range topics {
+ topic := fmt.Sprintf(t, conf.Conf.NsqConf.NodeId)
+ c.AddConsumer(topic)
+ }
+ return nil
+}
+func (c *consumerManager) AddConsumer(topic string) {
safe.Go(func() {
- caller := NewCaller(fmt.Sprintf(constvar.NsqTopicGetPlcAddress, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicSendPlcAddress, conf.Conf.NsqConf.NodeId))
- var addressResult common.ResponsePlcAddress
- err := caller.Call(common.RequestPlcAddress{DeviceId: conf.Conf.System.DeviceId}, &addressResult, time.Second*2)
+ client, err := NewConsumer(topic, conf.Conf.System.DeviceId)
if err != nil {
- logx.Infof("SendParams2 err: %v", err.Error())
+ logx.Errorf("start nsq consume err: %v", err)
+ }
+ c.clients.Store(topic, client)
+ logx.Infof("add consumer success, topic:%v", topic)
+ if len(conf.Conf.NsqConf.NsqlookupdAddr) > 0 {
+ if err = client.RunLookupd(conf.Conf.NsqConf.NsqlookupdAddr, 1); err != nil {
+ logx.Errorf("RunLookupd err:%v", err)
+ return
+ }
+ } else {
+ if err = client.Run(conf.Conf.NsqConf.NsqdAddr, 1); err != nil {
+ logx.Errorf("Run err:%v", err)
+ return
+ }
}
})
+}
- safe.Go(func() {
- _ = Consume(fmt.Sprintf(constvar.NsqTopicScheduleTask, conf.Conf.NsqConf.NodeId), conf.Conf.System.DeviceId)
+func (c *consumerManager) stop() {
+ if !atomic.CompareAndSwapInt32(&c.initFlag, 1, 0) {
+ return
+ }
+ c.clients.Range(func(key, value any) bool {
+ if consumer, ok := value.(*nsqclient.NsqConsumer); ok {
+ nsqclient.DestroyNsqConsumer(consumer)
+ logx.Infof("try stop consumer, topic : %v", key)
+ consumer = nil
+ c.clients.Delete(key)
+ }
+ return true
})
+}
- safe.Go(func() {
- _ = Consume(fmt.Sprintf(constvar.NsqTopicSendPlcAddress, conf.Conf.NsqConf.NodeId), conf.Conf.System.DeviceId)
- })
+func Init() error {
+ return defaultConsumerManager.init()
+}
- return nil
+func Stop() {
+ defaultConsumerManager.stop()
+ StopProducer()
}
--
Gitblit v1.8.0