From eba4eb850f0ecfb5839395aa125955ceaa2a454f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 16:39:07 +0800
Subject: [PATCH] Merge branch 'feat-serf'
---
nsq/consumer.go | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/nsq/consumer.go b/nsq/consumer.go
index d6e668a..d75a999 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
@@ -28,19 +27,9 @@
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