From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
nsq/consumer.go | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/nsq/consumer.go b/nsq/consumer.go
index 0f0bbdc..47c5f90 100644
--- a/nsq/consumer.go
+++ b/nsq/consumer.go
@@ -2,14 +2,14 @@
import (
"apsClient/conf"
+ "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
@@ -17,21 +17,15 @@
logx.Infof("Consume NewNsqConsumer topic:%v", topic)
var handler MsgHandler
switch topic {
- case fmt.Sprintf("aps.%v.scheduleTask", conf.Conf.NsqConf.NodeId):
+ case fmt.Sprintf(constvar.NsqTopicScheduleTask, conf.Conf.NsqConf.NodeId):
handler = new(ScheduleTask)
+ 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