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 | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/nsq/nsq.go b/nsq/nsq.go
index 2035f15..68274b2 100644
--- a/nsq/nsq.go
+++ b/nsq/nsq.go
@@ -3,20 +3,20 @@
import (
"apsClient/conf"
"apsClient/constvar"
- "apsClient/model/common"
"apsClient/pkg/logx"
+ "apsClient/pkg/nsqclient"
"apsClient/pkg/safe"
- "basic.com/aps/nsqclient.git"
"context"
"errors"
"fmt"
"sync"
- "time"
+ "sync/atomic"
)
type consumerManager struct {
- ctx context.Context
- clients sync.Map
+ ctx context.Context
+ clients sync.Map
+ initFlag int32
}
var defaultConsumerManager *consumerManager
@@ -29,24 +29,17 @@
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
}
- 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*3)
- if err != nil {
- logx.Infof("get plc address err: %v", err.Error())
- }
- })
-
var topics = []string{
constvar.NsqTopicScheduleTask,
- constvar.NsqTopicSendPlcAddress,
- constvar.NsqTopicProcessParamsResponse,
constvar.NsqTopicApsProcessParams,
constvar.NsqTopicDeviceUpdate,
+ constvar.NsqTopicPullDataResponse,
}
for _, t := range topics {
topic := fmt.Sprintf(t, conf.Conf.NsqConf.NodeId)
@@ -56,12 +49,13 @@
}
func (c *consumerManager) AddConsumer(topic string) {
- client, err := NewConsumer(topic, conf.Conf.System.DeviceId)
- if err != nil {
- logx.Errorf("start nsq consume err: %v", err)
- }
- c.clients.Store(topic, client)
safe.Go(func() {
+ client, err := NewConsumer(topic, conf.Conf.System.DeviceId)
+ if err != nil {
+ 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)
@@ -77,9 +71,15 @@
}
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
})
@@ -91,4 +91,5 @@
func Stop() {
defaultConsumerManager.stop()
+ StopProducer()
}
--
Gitblit v1.8.0