From a699ff979c84d024ca33fb1139224258f278319f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 20 十月 2023 11:32:23 +0800
Subject: [PATCH] debug
---
nsq/nsq.go | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/nsq/nsq.go b/nsq/nsq.go
index 064efa7..888cf08 100644
--- a/nsq/nsq.go
+++ b/nsq/nsq.go
@@ -3,15 +3,13 @@
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"
)
type consumerManager struct {
@@ -32,14 +30,6 @@
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,
@@ -47,6 +37,7 @@
constvar.NsqTopicProcessParamsResponse,
constvar.NsqTopicApsProcessParams,
constvar.NsqTopicDeviceUpdate,
+ constvar.NsqTopicPullDataResponse,
}
for _, t := range topics {
topic := fmt.Sprintf(t, conf.Conf.NsqConf.NodeId)
@@ -56,12 +47,12 @@
}
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)
if len(conf.Conf.NsqConf.NsqlookupdAddr) > 0 {
if err = client.RunLookupd(conf.Conf.NsqConf.NsqlookupdAddr, 1); err != nil {
logx.Errorf("RunLookupd err:%v", err)
@@ -73,8 +64,8 @@
return
}
}
+ logx.Infof("add consumer success, topic:%v", topic)
})
- logx.Infof("add consumer success, topic:%v", topic)
}
func (c *consumerManager) stop() {
--
Gitblit v1.8.0