From e9f6bf26943f3cc974d02a083cdac22af57e8cb4 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 03 十一月 2023 15:46:57 +0800
Subject: [PATCH] 去掉换行
---
nsq/consumer.go | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/nsq/consumer.go b/nsq/consumer.go
index feb2814..47c5f90 100644
--- a/nsq/consumer.go
+++ b/nsq/consumer.go
@@ -5,12 +5,11 @@
"apsClient/constvar"
"apsClient/pkg/logx"
"apsClient/pkg/nsqclient"
- "context"
"fmt"
)
-func Consume(topic, channel string) (err error) {
- c, err := nsqclient.NewNsqConsumer(context.Background(), topic, channel)
+func NewConsumer(topic, channel string) (c *nsqclient.NsqConsumer, err error) {
+ c, err = nsqclient.NewNsqConsumer(topic, channel)
if err != nil {
logx.Errorf("NewNsqConsumer err:%v", err)
return
@@ -20,21 +19,13 @@
switch topic {
case fmt.Sprintf(constvar.NsqTopicScheduleTask, conf.Conf.NsqConf.NodeId):
handler = new(ScheduleTask)
- case fmt.Sprintf(constvar.NsqTopicSendPlcAddress, conf.Conf.NsqConf.NodeId):
- handler = &PlcAddress{Topic: topic}
+ case fmt.Sprintf(constvar.NsqTopicApsProcessParams, conf.Conf.NsqConf.NodeId):
+ handler = &ProcessParamsSync{Topic: topic}
+ case fmt.Sprintf(constvar.NsqTopicDeviceUpdate, conf.Conf.NsqConf.NodeId):
+ handler = &DeviceUpdate{Topic: topic}
+ case fmt.Sprintf(constvar.NsqTopicPullDataResponse, conf.Conf.NsqConf.NodeId):
+ handler = &PullDataResponse{Topic: topic}
}
c.AddHandler(handler.HandleMessage)
-
- if len(conf.Conf.NsqConf.NsqlookupdAddr) > 0 {
- if err = c.RunLookupd(conf.Conf.NsqConf.NsqlookupdAddr, 1); err != nil {
- logx.Errorf("RunLookupd err:%v", err)
- return
- }
- } else {
- if err = c.Run(conf.Conf.NsqConf.NsqdAddr, 1); err != nil {
- logx.Errorf("Run err:%v", err)
- return
- }
- }
return
}
--
Gitblit v1.8.0